Skip to content

Commit 2101dc8

Browse files
author
Naseschwarz
committed
ci: Actually use toolchain in nightly/MSRV runs
Somehow at some point, additional rust toolchains became available in CI. Thus, it's no longer sufficient to install the matrix toolchain, but actually override it for the build directory.
1 parent 6a884d1 commit 2101dc8

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

.github/workflows/ci.yml

+22
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ jobs:
4141
toolchain: ${{ matrix.rust }}
4242
components: clippy
4343

44+
- name: Override rust toolchain
45+
run: rustup override set ${{ matrix.rust }}
46+
4447
- name: Rustup Show
4548
run: rustup show
4649

@@ -112,6 +115,12 @@ jobs:
112115
- name: Manually install target
113116
run: rustup target add x86_64-unknown-linux-musl
114117

118+
- name: Override rust toolchain
119+
run: rustup override set ${{ matrix.rust }}
120+
121+
- name: Rustup Show
122+
run: rustup show
123+
115124
- name: Setup MUSL
116125
run: |
117126
sudo apt-get -qq install musl-tools
@@ -166,6 +175,12 @@ jobs:
166175
echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu/bin" >> $GITHUB_PATH
167176
echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf/bin" >> $GITHUB_PATH
168177
178+
- name: Override rust toolchain
179+
run: rustup override set ${{ matrix.rust }}
180+
181+
- name: Rustup Show
182+
run: rustup show
183+
169184
- name: Build Debug
170185
run: |
171186
make build-linux-arm-debug
@@ -195,9 +210,16 @@ jobs:
195210
uses: dtolnay/rust-toolchain@master
196211
with:
197212
toolchain: ${{ matrix.rust }}
213+
198214
- name: Setup target
199215
run: rustup target add x86_64-apple-darwin
200216

217+
- name: Override rust toolchain
218+
run: rustup override set ${{ matrix.rust }}
219+
220+
- name: Rustup Show
221+
run: rustup show
222+
201223
- name: Build Debug
202224
run: |
203225
make build-apple-x86-debug

0 commit comments

Comments
 (0)