Skip to content

Commit 5315a95

Browse files
JohnTitorJohnTitor
committed
DNM: Shrink CI config for testing
1 parent 57eface commit 5315a95

File tree

2 files changed

+0
-314
lines changed

2 files changed

+0
-314
lines changed

‎.github/workflows/bors.yml

Lines changed: 0 additions & 246 deletions
Original file line numberDiff line numberDiff line change
@@ -7,86 +7,9 @@ on:
77
- try
88

99
jobs:
10-
docker_linux_tier1:
11-
name: Docker Linux Tier1
12-
runs-on: ubuntu-20.04
13-
strategy:
14-
fail-fast: true
15-
matrix:
16-
target: [
17-
i686-unknown-linux-gnu,
18-
x86_64-unknown-linux-gnu,
19-
]
20-
steps:
21-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
22-
with:
23-
github_token: "${{ secrets.GITHUB_TOKEN }}"
24-
- uses: actions/checkout@v2
25-
- name: Setup Rust toolchain
26-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
27-
- name: Execute run-docker.sh
28-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
29-
30-
macos:
31-
name: macOS
32-
runs-on: macos-10.15
33-
strategy:
34-
fail-fast: true
35-
matrix:
36-
target: [
37-
x86_64-apple-darwin,
38-
]
39-
steps:
40-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
41-
with:
42-
github_token: "${{ secrets.GITHUB_TOKEN }}"
43-
- uses: actions/checkout@v2
44-
- name: Setup Rust toolchain
45-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
46-
- name: Execute run.sh
47-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
48-
49-
windows:
50-
name: Windows
51-
runs-on: windows-2019
52-
env:
53-
OS: windows
54-
strategy:
55-
fail-fast: true
56-
matrix:
57-
include:
58-
- target: x86_64-pc-windows-gnu
59-
env:
60-
ARCH_BITS: 64
61-
ARCH: x86_64
62-
- target: x86_64-pc-windows-msvc
63-
# Disabled because broken:
64-
# https://github.com/rust-lang/libc/issues/1592
65-
#- target: i686-pc-windows-gnu
66-
# env:
67-
# ARCH_BITS: 32
68-
# ARCH: i686
69-
- target: i686-pc-windows-msvc
70-
steps:
71-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
72-
with:
73-
github_token: "${{ secrets.GITHUB_TOKEN }}"
74-
- uses: actions/checkout@v2
75-
- name: Self-update rustup
76-
run: rustup self update
77-
shell: bash
78-
- name: Setup Rust toolchain
79-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
80-
shell: bash
81-
- name: Execute run.sh
82-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
83-
shell: bash
84-
8510
style_check:
8611
name: Style check
8712
runs-on: ubuntu-20.04
88-
strategy:
89-
fail-fast: true
9013
steps:
9114
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
9215
with:
@@ -99,45 +22,13 @@ jobs:
9922

10023
docker_linux_tier2:
10124
name: Docker Linux Tier2
102-
needs: [docker_linux_tier1, style_check]
10325
runs-on: ubuntu-20.04
10426
strategy:
10527
fail-fast: true
10628
max-parallel: 12
10729
matrix:
10830
target: [
109-
# FIXME: Mysterious failures in CI, see
110-
# https://github.com/rust-lang/libc/issues/2081
111-
# aarch64-linux-android,
112-
aarch64-unknown-linux-gnu,
113-
aarch64-unknown-linux-musl,
114-
arm-linux-androideabi,
115-
arm-unknown-linux-gnueabihf,
116-
arm-unknown-linux-musleabihf,
117-
asmjs-unknown-emscripten,
118-
i686-linux-android,
119-
i686-unknown-linux-musl,
120-
mips-unknown-linux-gnu,
121-
mips-unknown-linux-musl,
122-
# FIXME: Somehow failed on CI
123-
# https://github.com/rust-lang/libc/runs/1659882216
124-
# mips64-unknown-linux-gnuabi64,
125-
# mips64el-unknown-linux-gnuabi64,
126-
mipsel-unknown-linux-musl,
127-
powerpc-unknown-linux-gnu,
128-
powerpc64-unknown-linux-gnu,
129-
powerpc64le-unknown-linux-gnu,
130-
s390x-unknown-linux-gnu,
131-
riscv64gc-unknown-linux-gnu,
13231
wasm32-wasi,
133-
sparc64-unknown-linux-gnu,
134-
wasm32-unknown-emscripten,
135-
x86_64-linux-android,
136-
x86_64-unknown-linux-gnux32,
137-
x86_64-unknown-linux-musl,
138-
# FIXME: It seems some items in `src/unix/mod.rs`
139-
# aren't defined on redox actually.
140-
# x86_64-unknown-redox,
14132
]
14233
steps:
14334
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
@@ -149,129 +40,6 @@ jobs:
14940
- name: Execute run-docker.sh
15041
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
15142

152-
# devkitpro's pacman needs to be connected from Docker.
153-
docker_switch:
154-
name: Docker Switch
155-
needs: [docker_linux_tier1, style_check]
156-
runs-on: ubuntu-20.04
157-
strategy:
158-
fail-fast: true
159-
steps:
160-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
161-
with:
162-
github_token: "${{ secrets.GITHUB_TOKEN }}"
163-
- uses: actions/checkout@v2
164-
- name: Setup Rust toolchain
165-
run: sh ./ci/install-rust.sh
166-
- name: Execute run-docker.sh
167-
run: LIBC_CI=1 sh ./ci/run-docker.sh switch
168-
169-
build_channels_linux:
170-
name: Build Channels Linux
171-
needs: docker_linux_tier2
172-
runs-on: ubuntu-20.04
173-
env:
174-
OS: linux
175-
strategy:
176-
fail-fast: true
177-
max-parallel: 5
178-
matrix:
179-
toolchain: [
180-
stable,
181-
beta,
182-
nightly,
183-
1.13.0,
184-
1.19.0,
185-
1.24.0,
186-
1.25.0,
187-
1.30.0,
188-
]
189-
steps:
190-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
191-
with:
192-
github_token: "${{ secrets.GITHUB_TOKEN }}"
193-
- uses: actions/checkout@v2
194-
- name: Setup Rust toolchain
195-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
196-
- name: Execute build.sh
197-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
198-
199-
build_channels_macos:
200-
name: Build Channels macOS
201-
needs: macos
202-
runs-on: macos-10.15
203-
env:
204-
OS: macos
205-
strategy:
206-
fail-fast: true
207-
max-parallel: 4
208-
matrix:
209-
toolchain: [
210-
stable,
211-
beta,
212-
nightly,
213-
1.13.0,
214-
1.19.0,
215-
1.24.0,
216-
1.25.0,
217-
1.30.0,
218-
]
219-
steps:
220-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
221-
with:
222-
github_token: "${{ secrets.GITHUB_TOKEN }}"
223-
- uses: actions/checkout@v2
224-
- name: Setup Rust toolchain
225-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
226-
- name: Execute build.sh
227-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
228-
229-
semver_linux:
230-
name: Semver Linux
231-
needs: build_channels_linux
232-
runs-on: ubuntu-20.04
233-
continue-on-error: true
234-
strategy:
235-
fail-fast: true
236-
steps:
237-
- uses: actions/checkout@v2
238-
- name: Setup Rust toolchain
239-
# Should update the semverver revision in semver.sh if we touch nightly ver.
240-
run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
241-
- name: Check breaking changes
242-
run: sh ci/semver.sh linux
243-
244-
semver_macos:
245-
name: Semver macOS
246-
needs: build_channels_macos
247-
runs-on: macos-10.15
248-
continue-on-error: true
249-
strategy:
250-
fail-fast: true
251-
steps:
252-
- uses: actions/checkout@v2
253-
- name: Setup Rust toolchain
254-
# FIXME: Pin nightly version to make semverver compilable.
255-
run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
256-
- name: Check breaking changes
257-
run: sh ci/semver.sh macos
258-
259-
docs:
260-
name: Generate documentation
261-
runs-on: ubuntu-20.04
262-
needs: docker_linux_tier2
263-
strategy:
264-
fail-fast: true
265-
steps:
266-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
267-
with:
268-
github_token: "${{ secrets.GITHUB_TOKEN }}"
269-
- uses: actions/checkout@v2
270-
- name: Setup Rust toolchain
271-
run: sh ./ci/install-rust.sh
272-
- name: Generate documentation
273-
run: LIBC_CI=1 sh ci/dox.sh
274-
27543
# These jobs doesn't actually test anything, but they're only used to tell
27644
# bors the build completed, as there is no practical way to detect when a
27745
# workflow is successful listening to webhooks only.
@@ -283,15 +51,8 @@ jobs:
28351
if: github.event.pusher.name == 'bors' && success()
28452
runs-on: ubuntu-20.04
28553
needs: [
286-
docker_linux_tier1,
28754
docker_linux_tier2,
288-
macos,
289-
windows,
29055
style_check,
291-
docker_switch,
292-
build_channels_linux,
293-
build_channels_macos,
294-
docs,
29556
]
29657

29758
steps:
@@ -303,15 +64,8 @@ jobs:
30364
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
30465
runs-on: ubuntu-20.04
30566
needs: [
306-
docker_linux_tier1,
30767
docker_linux_tier2,
308-
macos,
309-
windows,
31068
style_check,
311-
docker_switch,
312-
build_channels_linux,
313-
build_channels_macos,
314-
docs,
31569
]
31670

31771
steps:

‎.github/workflows/main.yml

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -8,77 +8,9 @@ on:
88
- master
99

1010
jobs:
11-
docker_linux_tier1:
12-
name: Docker Linux Tier1
13-
runs-on: ubuntu-20.04
14-
strategy:
15-
fail-fast: true
16-
matrix:
17-
target: [
18-
i686-unknown-linux-gnu,
19-
x86_64-unknown-linux-gnu,
20-
]
21-
steps:
22-
- uses: actions/checkout@v2
23-
- name: Setup Rust toolchain
24-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
25-
- name: Execute run-docker.sh
26-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
27-
28-
macos:
29-
name: macOS
30-
runs-on: macos-10.15
31-
strategy:
32-
fail-fast: true
33-
matrix:
34-
target: [
35-
x86_64-apple-darwin,
36-
]
37-
steps:
38-
- uses: actions/checkout@v2
39-
- name: Setup Rust toolchain
40-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
41-
- name: Execute run.sh
42-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
43-
44-
windows:
45-
name: Windows
46-
runs-on: windows-2019
47-
env:
48-
OS: windows
49-
strategy:
50-
fail-fast: true
51-
matrix:
52-
include:
53-
- target: x86_64-pc-windows-gnu
54-
env:
55-
ARCH_BITS: 64
56-
ARCH: x86_64
57-
- target: x86_64-pc-windows-msvc
58-
# Disabled because broken:
59-
# https://github.com/rust-lang/libc/issues/1592
60-
#- target: i686-pc-windows-gnu
61-
# env:
62-
# ARCH_BITS: 32
63-
# ARCH: i686
64-
- target: i686-pc-windows-msvc
65-
steps:
66-
- uses: actions/checkout@v2
67-
- name: Self-update rustup
68-
run: rustup self update
69-
shell: bash
70-
- name: Setup Rust toolchain
71-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
72-
shell: bash
73-
- name: Execute run.sh
74-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
75-
shell: bash
76-
7711
style_check:
7812
name: Style check
7913
runs-on: ubuntu-20.04
80-
strategy:
81-
fail-fast: true
8214
steps:
8315
- uses: actions/checkout@v2
8416
- name: Setup Rust toolchain

0 commit comments

Comments
 (0)