Skip to content

Commit ab61f99

Browse files
Merge pull request #44 from rust-embedded/pin-rustc
Pin qemu-test to specific rustc version.
2 parents cdf224f + 957a1e1 commit ab61f99

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,10 @@ jobs:
301301
steps:
302302
- name: Checkout
303303
uses: actions/checkout@v4
304+
- name: Install rust
305+
run: |
306+
rustup install 1.88
307+
rustup default 1.88
304308
- name: Install Dependencies
305309
run: |
306310
sudo apt-get -y update

tests.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
rustup target add armv7r-none-eabi
77
rustup target add armv7r-none-eabihf
88
rustup target add armv7a-none-eabi
9-
rustup toolchain add nightly
10-
rustup component add rust-src --toolchain=nightly
9+
rustup component add rust-src
1110

1211
FAILURE=0
1312

@@ -64,10 +63,10 @@ if qemu-system-arm --version | grep "version 9"; then
6463
for bin_path in $(ls examples/mps3-an536/src/bin/*.rs); do
6564
filename=${bin_path##*/}
6665
binary=${filename%.rs}
67-
cargo +nightly run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin $binary --features=gic -Zbuild-std=core | tee ./target/$binary-armv8r-none-eabihf.out
66+
RUSTC_BOOTSTRAP=1 cargo run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin $binary --features=gic -Zbuild-std=core | tee ./target/$binary-armv8r-none-eabihf.out
6867
my_diff ./examples/mps3-an536/reference/$binary-armv8r-none-eabihf.out ./target/$binary-armv8r-none-eabihf.out || fail $binary "armv8r-none-eabihf"
6968
done
70-
cargo +nightly run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin smp_test --features=gic -Zbuild-std=core -- -smp 2 | tee ./target/smp_test-armv8r-none-eabihf_smp2.out
69+
RUSTC_BOOTSTRAP=1 cargo run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin smp_test --features=gic -Zbuild-std=core -- -smp 2 | tee ./target/smp_test-armv8r-none-eabihf_smp2.out
7170
my_diff ./examples/mps3-an536/reference/smp_test-armv8r-none-eabihf_smp2.out ./target/smp_test-armv8r-none-eabihf_smp2.out || fail smp_test "armv8r-none-eabihf"
7271
fi
7372

0 commit comments

Comments
 (0)