Skip to content

Commit 04b3b07

Browse files
committed
ci: just set required env globally
(backport <rust-lang#3891>) (cherry picked from commit 7294016)
1 parent 164a8a4 commit 04b3b07

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:
@@ -117,7 +120,7 @@ jobs:
117120
- name: Setup Rust toolchain
118121
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
119122
- name: Execute run-docker.sh
120-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
123+
run: sh ./ci/run-docker.sh ${{ matrix.target }}
121124

122125
build_channels_linux:
123126
name: Build Channels Linux
@@ -145,7 +148,7 @@ jobs:
145148
- name: Setup Rust toolchain
146149
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
147150
- name: Execute build.sh
148-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
151+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
149152

150153
build_channels_macos:
151154
name: Build Channels macOS
@@ -166,7 +169,7 @@ jobs:
166169
- name: Setup Rust toolchain
167170
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
168171
- name: Execute build.sh
169-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
172+
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
170173

171174
build_channels_windows:
172175
name: Build Channels Windows
@@ -188,7 +191,7 @@ jobs:
188191
run: rustup self update
189192
shell: bash
190193
- name: Execute build.sh
191-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
194+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
192195
shell: bash
193196

194197
check_cfg:
@@ -199,7 +202,7 @@ jobs:
199202
- name: Setup Rust toolchain
200203
run: TOOLCHAIN=nightly sh ./ci/install-rust.sh
201204
- name: Build with check-cfg
202-
run: LIBC_CI=1 LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
205+
run: LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
203206

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

0 commit comments

Comments
 (0)