Skip to content

Commit 179a6db

Browse files
tgross35AkhilTThomas
authored andcommitted
ci: reorder jobs, don't make native linux depend on tier 2 tests
(backport <rust-lang#3891>) (cherry picked from commit 2e4e0ed)
1 parent f389877 commit 179a6db

File tree

1 file changed

+102
-63
lines changed

1 file changed

+102
-63
lines changed

.github/workflows/full_ci.yml

Lines changed: 102 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -10,68 +10,6 @@ env:
1010
LIBC_CI: 1
1111

1212
jobs:
13-
docker_linux_tier1:
14-
name: Docker Linux Tier1
15-
runs-on: ubuntu-22.04
16-
strategy:
17-
fail-fast: true
18-
matrix:
19-
target:
20-
- i686-unknown-linux-gnu
21-
- x86_64-unknown-linux-gnu
22-
steps:
23-
- uses: actions/checkout@v4
24-
- name: Setup Rust toolchain
25-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
26-
- name: Execute run-docker.sh
27-
run: sh ./ci/run-docker.sh ${{ matrix.target }}
28-
29-
macos:
30-
name: macOS
31-
runs-on: macos-13
32-
strategy:
33-
fail-fast: true
34-
matrix:
35-
target:
36-
- x86_64-apple-darwin
37-
steps:
38-
- uses: actions/checkout@v4
39-
- name: Setup Rust toolchain
40-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
41-
- name: Execute run.sh
42-
run: sh ./ci/run.sh ${{ matrix.target }}
43-
44-
windows:
45-
name: Windows
46-
runs-on: windows-2022
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-
#- target: i686-pc-windows-gnu
59-
# env:
60-
# ARCH_BITS: 32
61-
# ARCH: i686
62-
- target: i686-pc-windows-msvc
63-
steps:
64-
- uses: actions/checkout@v4
65-
- name: Self-update rustup
66-
run: rustup self update
67-
shell: bash
68-
- name: Setup Rust toolchain
69-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
70-
shell: bash
71-
- name: Execute run.sh
72-
run: sh ./ci/run.sh ${{ matrix.target }}
73-
shell: bash
74-
7513
style_check:
7614
name: Style check
7715
runs-on: ubuntu-22.04
@@ -162,7 +100,6 @@ jobs:
162100

163101
build_channels_linux:
164102
name: Build Channels Linux
165-
needs: docker_linux_tier2
166103
runs-on: ubuntu-22.04
167104
env:
168105
OS: linux
@@ -232,6 +169,108 @@ jobs:
232169
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
233170
shell: bash
234171

172+
macos:
173+
name: macOS
174+
runs-on: macos-13
175+
strategy:
176+
fail-fast: true
177+
matrix:
178+
target:
179+
- x86_64-apple-darwin
180+
steps:
181+
- uses: actions/checkout@v4
182+
- name: Setup Rust toolchain
183+
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
184+
- name: Execute run.sh
185+
run: sh ./ci/run.sh ${{ matrix.target }}
186+
187+
windows:
188+
name: Windows
189+
runs-on: windows-2022
190+
env:
191+
OS: windows
192+
strategy:
193+
fail-fast: true
194+
matrix:
195+
include:
196+
- target: x86_64-pc-windows-gnu
197+
env:
198+
ARCH_BITS: 64
199+
ARCH: x86_64
200+
- target: x86_64-pc-windows-msvc
201+
#- target: i686-pc-windows-gnu
202+
# env:
203+
# ARCH_BITS: 32
204+
# ARCH: i686
205+
- target: i686-pc-windows-msvc
206+
steps:
207+
- uses: actions/checkout@v4
208+
- name: Self-update rustup
209+
run: rustup self update
210+
shell: bash
211+
- name: Setup Rust toolchain
212+
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
213+
shell: bash
214+
- name: Execute run.sh
215+
run: sh ./ci/run.sh ${{ matrix.target }}
216+
shell: bash
217+
218+
docker_linux_tier1:
219+
name: Docker Linux Tier1
220+
runs-on: ubuntu-22.04
221+
strategy:
222+
fail-fast: true
223+
matrix:
224+
target:
225+
- i686-unknown-linux-gnu
226+
- x86_64-unknown-linux-gnu
227+
steps:
228+
- uses: actions/checkout@v4
229+
- name: Setup Rust toolchain
230+
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
231+
- name: Execute run-docker.sh
232+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
233+
234+
docker_linux_tier2:
235+
name: Docker Linux Tier2
236+
needs: [docker_linux_tier1, style_check]
237+
runs-on: ubuntu-22.04
238+
strategy:
239+
fail-fast: true
240+
max-parallel: 12
241+
matrix:
242+
target:
243+
- aarch64-linux-android
244+
- aarch64-unknown-linux-gnu
245+
- aarch64-unknown-linux-musl
246+
- arm-linux-androideabi
247+
- arm-unknown-linux-gnueabihf
248+
- arm-unknown-linux-musleabihf
249+
- i686-linux-android
250+
- i686-unknown-linux-musl
251+
- powerpc-unknown-linux-gnu
252+
- powerpc64-unknown-linux-gnu
253+
- powerpc64le-unknown-linux-gnu
254+
- s390x-unknown-linux-gnu
255+
- riscv64gc-unknown-linux-gnu
256+
- wasm32-wasip1
257+
- wasm32-wasip2
258+
- sparc64-unknown-linux-gnu
259+
- wasm32-unknown-emscripten
260+
- x86_64-linux-android
261+
# FIXME: Exec format error (os error 8)
262+
# - x86_64-unknown-linux-gnux32
263+
- x86_64-unknown-linux-musl
264+
# FIXME: It seems some items in `src/unix/mod.rs`
265+
# aren't defined on redox actually.
266+
# - x86_64-unknown-redox
267+
steps:
268+
- uses: actions/checkout@v4
269+
- name: Setup Rust toolchain
270+
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
271+
- name: Execute run-docker.sh
272+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
273+
235274
check_cfg:
236275
name: "Check #[cfg]s"
237276
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)