Skip to content

Commit 8e828e9

Browse files
committed
ci: use env rather than passing environment inline
1 parent 4be662b commit 8e828e9

File tree

1 file changed

+26
-10
lines changed

1 file changed

+26
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ jobs:
3434
- beta
3535
- nightly
3636
- 1.63.0
37+
env:
38+
TOOLCHAIN: ${{ matrix.toolchain }}
3739
steps:
3840
- uses: actions/checkout@v4
3941
- name: Setup Rust toolchain
40-
run: TOOLCHAIN=${{ matrix.toolchain }} ./ci/install-rust.sh
42+
run: ./ci/install-rust.sh
4143
- name: Execute build.sh
42-
run: TOOLCHAIN=${{ matrix.toolchain }} ./ci/build.sh
44+
run: ./ci/build.sh
4345

4446
build_channels_macos:
4547
name: Build Channels macOS
@@ -56,12 +58,14 @@ jobs:
5658
- { toolchain: nightly, os: macos-14 }
5759
- { toolchain: 1.63.0, os: macos-14 }
5860
runs-on: ${{ matrix.target.os }}
61+
env:
62+
TOOLCHAIN: ${{ matrix.toolchain }}
5963
steps:
6064
- uses: actions/checkout@v4
6165
- name: Setup Rust toolchain
62-
run: TOOLCHAIN=${{ matrix.target.toolchain }} ./ci/install-rust.sh
66+
run: ./ci/install-rust.sh
6367
- name: Execute build.sh
64-
run: TOOLCHAIN=${{ matrix.target.toolchain }} ./ci/build.sh
68+
run: ./ci/build.sh
6569

6670
build_channels_windows:
6771
name: Build Channels Windows
@@ -74,13 +78,15 @@ jobs:
7478
toolchain:
7579
- 1.63.0
7680
- stable
81+
env:
82+
TOOLCHAIN: ${{ matrix.toolchain }}
7783
steps:
7884
- uses: actions/checkout@v4
7985
- name: Self-update rustup
8086
run: rustup self update
8187
shell: bash
8288
- name: Execute build.sh
83-
run: TOOLCHAIN=${{ matrix.toolchain }} ./ci/build.sh
89+
run: ./ci/build.sh
8490
shell: bash
8591

8692
macos:
@@ -91,10 +97,12 @@ jobs:
9197
matrix:
9298
target:
9399
- aarch64-apple-darwin
100+
env:
101+
TARGET: ${{ matrix.target }}
94102
steps:
95103
- uses: actions/checkout@v4
96104
- name: Setup Rust toolchain
97-
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
105+
run: ./ci/install-rust.sh
98106
- name: Execute run.sh
99107
run: ./ci/run.sh ${{ matrix.target }}
100108

@@ -118,13 +126,15 @@ jobs:
118126
# ARCH_BITS: 32
119127
# ARCH: i686
120128
- target: i686-pc-windows-msvc
129+
env:
130+
TARGET: ${{ matrix.target }}
121131
steps:
122132
- uses: actions/checkout@v4
123133
- name: Self-update rustup
124134
run: rustup self update
125135
shell: bash
126136
- name: Setup Rust toolchain
127-
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
137+
run: ./ci/install-rust.sh
128138
shell: bash
129139
- name: Execute run.sh
130140
run: ./ci/run.sh ${{ matrix.target }}
@@ -140,10 +150,12 @@ jobs:
140150
target:
141151
- i686-unknown-linux-gnu
142152
- x86_64-unknown-linux-gnu
153+
env:
154+
TARGET: ${{ matrix.target }}
143155
steps:
144156
- uses: actions/checkout@v4
145157
- name: Setup Rust toolchain
146-
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
158+
run: ./ci/install-rust.sh
147159
- name: Execute run-docker.sh
148160
run: ./ci/run-docker.sh ${{ matrix.target }}
149161

@@ -182,10 +194,12 @@ jobs:
182194
# FIXME: It seems some items in `src/unix/mod.rs`
183195
# aren't defined on redox actually.
184196
# - x86_64-unknown-redox
197+
env:
198+
TARGET: ${{ matrix.target }}
185199
steps:
186200
- uses: actions/checkout@v4
187201
- name: Setup Rust toolchain
188-
run: TARGET=${{ matrix.target }} ./ci/install-rust.sh
202+
run: ./ci/install-rust.sh
189203
- name: Execute run-docker.sh
190204
run: ./ci/run-docker.sh ${{ matrix.target }}
191205

@@ -219,10 +233,12 @@ jobs:
219233
check_cfg:
220234
name: "Check #[cfg]s"
221235
runs-on: ubuntu-22.04
236+
env:
237+
TOOLCHAIN: nightly
222238
steps:
223239
- uses: actions/checkout@v4
224240
- name: Setup Rust toolchain
225-
run: TOOLCHAIN=nightly ./ci/install-rust.sh
241+
run: ./ci/install-rust.sh
226242
- name: Build with check-cfg
227243
run: LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
228244

0 commit comments

Comments
 (0)