Skip to content

Commit f389877

Browse files
tgross35AkhilTThomas
authored andcommitted
ci: just set required env globally
(backport <rust-lang#3891>) (cherry picked from commit 7294016)
1 parent 35a82a3 commit f389877

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

.github/workflows/full_ci.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ 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
@@ -21,7 +24,7 @@ jobs:
2124
- name: Setup Rust toolchain
2225
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
2326
- name: Execute run-docker.sh
24-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
27+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
2528

2629
macos:
2730
name: macOS
@@ -36,7 +39,7 @@ jobs:
3639
- name: Setup Rust toolchain
3740
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
3841
- name: Execute run.sh
39-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
42+
run: sh ./ci/run.sh ${{ matrix.target }}
4043

4144
windows:
4245
name: Windows
@@ -66,7 +69,7 @@ jobs:
6669
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
6770
shell: bash
6871
- name: Execute run.sh
69-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
72+
run: sh ./ci/run.sh ${{ matrix.target }}
7073
shell: bash
7174

7275
style_check:
@@ -116,7 +119,7 @@ jobs:
116119
- name: Setup Rust toolchain
117120
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
118121
- name: Execute run-docker.sh
119-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
122+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
120123

121124
# These targets are tier 3 or otherwise need to have CI build std via -Zbuild-std.
122125
# Because of this, only the nightly compiler can be used on these targets.
@@ -183,7 +186,7 @@ jobs:
183186
- name: Setup Rust toolchain
184187
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
185188
- name: Execute build.sh
186-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
189+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
187190

188191
build_channels_macos:
189192
name: Build Channels macOS
@@ -204,7 +207,7 @@ jobs:
204207
- name: Setup Rust toolchain
205208
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
206209
- name: Execute build.sh
207-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
210+
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
208211

209212
build_channels_windows:
210213
name: Build Channels Windows
@@ -226,7 +229,7 @@ jobs:
226229
run: rustup self update
227230
shell: bash
228231
- name: Execute build.sh
229-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
232+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
230233
shell: bash
231234

232235
check_cfg:
@@ -237,7 +240,7 @@ jobs:
237240
- name: Setup Rust toolchain
238241
run: TOOLCHAIN=nightly sh ./ci/install-rust.sh
239242
- name: Build with check-cfg
240-
run: LIBC_CI=1 LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
243+
run: LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
241244

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

0 commit comments

Comments
 (0)