Skip to content

Commit 493be18

Browse files
committed
ci: just set required env globally
(backport <#3891>) (cherry picked from commit 7294016)
1 parent 164a8a4 commit 493be18

File tree

1 file changed

+33
-8
lines changed

1 file changed

+33
-8
lines changed

.github/workflows/full_ci.yml

+33-8
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,37 @@ on:
66
branches:
77
- libc-0.2
88

9+
env:
10+
LIBC_CI: 1
11+
912
jobs:
1013
docker_linux_tier1:
1114
name: Docker Linux Tier1
1215
runs-on: ubuntu-22.04
1316
strategy:
1417
fail-fast: true
18+
max-parallel: 5
19+
matrix:
20+
toolchain:
21+
- stable
22+
- beta
23+
- nightly
24+
- 1.63.0
25+
steps:
26+
- uses: actions/checkout@v4
27+
- name: Setup Rust toolchain
28+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
29+
- name: Execute build.sh
30+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
31+
32+
build_channels_macos:
33+
name: Build Channels macOS
34+
needs: macos
35+
env:
36+
OS: macos
37+
strategy:
38+
fail-fast: true
39+
max-parallel: 4
1540
matrix:
1641
target:
1742
- i686-unknown-linux-gnu
@@ -21,7 +46,7 @@ jobs:
2146
- name: Setup Rust toolchain
2247
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
2348
- name: Execute run-docker.sh
24-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
49+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
2550

2651
macos:
2752
name: macOS
@@ -36,7 +61,7 @@ jobs:
3661
- name: Setup Rust toolchain
3762
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
3863
- name: Execute run.sh
39-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
64+
run: sh ./ci/run.sh ${{ matrix.target }}
4065

4166
windows:
4267
name: Windows
@@ -66,7 +91,7 @@ jobs:
6691
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
6792
shell: bash
6893
- name: Execute run.sh
69-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
94+
run: sh ./ci/run.sh ${{ matrix.target }}
7095
shell: bash
7196

7297
style_check:
@@ -117,7 +142,7 @@ jobs:
117142
- name: Setup Rust toolchain
118143
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
119144
- name: Execute run-docker.sh
120-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
145+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
121146

122147
build_channels_linux:
123148
name: Build Channels Linux
@@ -145,7 +170,7 @@ jobs:
145170
- name: Setup Rust toolchain
146171
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
147172
- name: Execute build.sh
148-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
173+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
149174

150175
build_channels_macos:
151176
name: Build Channels macOS
@@ -166,7 +191,7 @@ jobs:
166191
- name: Setup Rust toolchain
167192
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
168193
- name: Execute build.sh
169-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
194+
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
170195

171196
build_channels_windows:
172197
name: Build Channels Windows
@@ -188,7 +213,7 @@ jobs:
188213
run: rustup self update
189214
shell: bash
190215
- name: Execute build.sh
191-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
216+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
192217
shell: bash
193218

194219
check_cfg:
@@ -199,7 +224,7 @@ jobs:
199224
- name: Setup Rust toolchain
200225
run: TOOLCHAIN=nightly sh ./ci/install-rust.sh
201226
- name: Build with check-cfg
202-
run: LIBC_CI=1 LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
227+
run: LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
203228

204229
# One job that "summarizes" the success state of this pipeline. This can then be added to branch
205230
# protection, rather than having to add each job separately.

0 commit comments

Comments
 (0)