Skip to content

Commit a4748ca

Browse files
committed
ci: use rust-toolchain.toml
1 parent 146d8e4 commit a4748ca

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ env:
1919
PUBLIC_SIMICS_ISPM_VERSION: "1.8.3"
2020
MINGW_URL: "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-16.0.6-11.0.0-ucrt-r1/winlibs-x86_64-posix-seh-gcc-13.2.0-llvm-16.0.6-mingw-w64ucrt-11.0.0-r1.7z"
2121
MINGW_VERSION: "13.2.0-16.0.6-11.0.0-ucrt-r1"
22-
RUST_NIGHTLY_VERSION: "2025-02-28"
2322

2423
permissions:
2524
contents: read
@@ -472,9 +471,6 @@ jobs:
472471
chmod -R 0755 tests/rsrc/
473472
474473
- uses: dtolnay/rust-toolchain@83bdede770b06329615974cf8c786f845d824dfb # nightly
475-
with:
476-
toolchain: nightly-${{ env.RUST_NIGHTLY_VERSION }}
477-
components: rustfmt,clippy,miri
478474

479475
- name: Cache SIMICS Dependencies
480476
id: cache-simics-packages
@@ -579,7 +575,7 @@ jobs:
579575
echo "Downloading Rustup"
580576
Invoke-WebRequest -URI https://win.rustup.rs/x86_64 -OutFile C:\rustup-init.exe
581577
echo "Installing Rust"
582-
C:\rustup-init.exe --default-toolchain nightly-${{ env.RUST_NIGHTLY_VERSION }} --default-host x86_64-pc-windows-gnu -y
578+
C:\rustup-init.exe --default-host x86_64-pc-windows-gnu -y
583579
584580
- name: Cache SIMICS
585581
id: cache-simics-packages-windows
@@ -657,6 +653,8 @@ jobs:
657653
# but it always verifies them.
658654
- name: Build Distribution Package
659655
run: |
656+
RUST_NIGHTLY_VERSION=$(grep '^channel' rust-toolchain.toml | cut -d '"' -f 2 | sed 's/^nightly-//')
657+
export RUST_NIGHTLY_VERSION
660658
./scripts/build.sh
661659
662660
- name: Upload Distribution Package

0 commit comments

Comments
 (0)