Skip to content

Commit 3946ab9

Browse files
committed
ci: reorder jobs, don't make native linux depend on tier 2 tests
(backport <#3891>) (cherry picked from commit 2e4e0ed)
1 parent 04b3b07 commit 3946ab9

File tree

1 file changed

+84
-84
lines changed

1 file changed

+84
-84
lines changed

.github/workflows/full_ci.yml

+84-84
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,87 @@ env:
1010
LIBC_CI: 1
1111

1212
jobs:
13-
docker_linux_tier1:
14-
name: Docker Linux Tier1
13+
style_check:
14+
name: Style check
1515
runs-on: ubuntu-22.04
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Setup Rust toolchain
19+
run: sh ./ci/install-rust.sh
20+
- name: Check style
21+
run: sh ci/style.sh
22+
23+
build_channels_linux:
24+
name: Build Channels Linux
25+
needs: docker_linux_tier2
26+
runs-on: ubuntu-22.04
27+
env:
28+
OS: linux
29+
strategy:
30+
fail-fast: true
31+
max-parallel: 5
32+
matrix:
33+
toolchain:
34+
- stable
35+
- beta
36+
- nightly
37+
# FIXME: Disabled due to:
38+
# error: failed to parse registry's information for: serde
39+
# 1.13.0,
40+
- 1.19.0
41+
- 1.24.0
42+
- 1.25.0
43+
- 1.30.0
44+
steps:
45+
- uses: actions/checkout@v4
46+
- name: Setup Rust toolchain
47+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
48+
- name: Execute build.sh
49+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
50+
51+
build_channels_macos:
52+
name: Build Channels macOS
53+
needs: macos
54+
env:
55+
OS: macos
1656
strategy:
1757
fail-fast: true
58+
max-parallel: 4
1859
matrix:
1960
target:
20-
- i686-unknown-linux-gnu
21-
- x86_64-unknown-linux-gnu
61+
- { toolchain: stable, os: macos-13 }
62+
- { toolchain: beta, os: macos-13 }
63+
- { toolchain: nightly, os: macos-13 }
64+
runs-on: ${{ matrix.target.os }}
2265
steps:
2366
- uses: actions/checkout@v4
2467
- 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 }}
68+
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
69+
- name: Execute build.sh
70+
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
71+
72+
build_channels_windows:
73+
name: Build Channels Windows
74+
runs-on: windows-2022
75+
env:
76+
OS: windows
77+
strategy:
78+
fail-fast: true
79+
matrix:
80+
toolchain:
81+
- 1.19.0
82+
- 1.24.0
83+
- 1.25.0
84+
- 1.30.0
85+
- stable
86+
steps:
87+
- uses: actions/checkout@v4
88+
- name: Self-update rustup
89+
run: rustup self update
90+
shell: bash
91+
- name: Execute build.sh
92+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
93+
shell: bash
2894

2995
macos:
3096
name: macOS
@@ -72,15 +138,21 @@ jobs:
72138
run: sh ./ci/run.sh ${{ matrix.target }}
73139
shell: bash
74140

75-
style_check:
76-
name: Style check
141+
docker_linux_tier1:
142+
name: Docker Linux Tier1
77143
runs-on: ubuntu-22.04
144+
strategy:
145+
fail-fast: true
146+
matrix:
147+
target:
148+
- i686-unknown-linux-gnu
149+
- x86_64-unknown-linux-gnu
78150
steps:
79151
- uses: actions/checkout@v4
80152
- name: Setup Rust toolchain
81-
run: sh ./ci/install-rust.sh
82-
- name: Check style
83-
run: sh ci/style.sh
153+
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
154+
- name: Execute run-docker.sh
155+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
84156

85157
docker_linux_tier2:
86158
name: Docker Linux Tier2
@@ -122,78 +194,6 @@ jobs:
122194
- name: Execute run-docker.sh
123195
run: sh ./ci/run-docker.sh ${{ matrix.target }}
124196

125-
build_channels_linux:
126-
name: Build Channels Linux
127-
needs: docker_linux_tier2
128-
runs-on: ubuntu-22.04
129-
env:
130-
OS: linux
131-
strategy:
132-
fail-fast: true
133-
max-parallel: 5
134-
matrix:
135-
toolchain:
136-
- stable
137-
- beta
138-
- nightly
139-
# FIXME: Disabled due to:
140-
# error: failed to parse registry's information for: serde
141-
# 1.13.0,
142-
- 1.19.0
143-
- 1.24.0
144-
- 1.25.0
145-
- 1.30.0
146-
steps:
147-
- uses: actions/checkout@v4
148-
- name: Setup Rust toolchain
149-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
150-
- name: Execute build.sh
151-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
152-
153-
build_channels_macos:
154-
name: Build Channels macOS
155-
needs: macos
156-
env:
157-
OS: macos
158-
strategy:
159-
fail-fast: true
160-
max-parallel: 4
161-
matrix:
162-
target:
163-
- { toolchain: stable, os: macos-13 }
164-
- { toolchain: beta, os: macos-13 }
165-
- { toolchain: nightly, os: macos-13 }
166-
runs-on: ${{ matrix.target.os }}
167-
steps:
168-
- uses: actions/checkout@v4
169-
- name: Setup Rust toolchain
170-
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
171-
- name: Execute build.sh
172-
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
173-
174-
build_channels_windows:
175-
name: Build Channels Windows
176-
runs-on: windows-2022
177-
env:
178-
OS: windows
179-
strategy:
180-
fail-fast: true
181-
matrix:
182-
toolchain:
183-
- 1.19.0
184-
- 1.24.0
185-
- 1.25.0
186-
- 1.30.0
187-
- stable
188-
steps:
189-
- uses: actions/checkout@v4
190-
- name: Self-update rustup
191-
run: rustup self update
192-
shell: bash
193-
- name: Execute build.sh
194-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
195-
shell: bash
196-
197197
check_cfg:
198198
name: "Check #[cfg]s"
199199
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)