Skip to content

Commit dfed572

Browse files
committed
ci: pin Rust nightly to 2025-02-28
1 parent 85806cc commit dfed572

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/builder/common.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55

66
set -e
77

8+
if [ -z "${RUST_NIGHTLY_VERSION}" ]; then
9+
echo "RUST_NIGHTLY_VERSION not set. It should be defined by ci.yml workflow."
10+
exit 1
11+
fi
12+
813
download_and_verify_llvm() {
914
LLVM_PGP_KEY_URL="https://releases.llvm.org/5.0.2/tstellar-gpg-key.asc"
1015
LLD_URL="https://releases.llvm.org/5.0.2/lld-5.0.2.src.tar.xz"
@@ -107,8 +112,8 @@ download_and_verify_make() {
107112

108113
download_and_verify_rust() {
109114
RUST_GPG_KEY_URL="https://static.rust-lang.org/rust-key.gpg.ascii"
110-
RUST_URL="https://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.xz"
111-
RUST_SIG_URL="https://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.xz.asc"
115+
RUST_URL="https://static.rust-lang.org/dist/${RUST_NIGHTLY_VERSION}/rust-nightly-x86_64-unknown-linux-gnu.tar.xz"
116+
RUST_SIG_URL="https://static.rust-lang.org/dist/${RUST_NIGHTLY_VERSION}/rust-nightly-x86_64-unknown-linux-gnu.tar.xz.asc"
112117

113118
if [ -z "${BUILDER_DIR}" ]; then
114119
echo "BUILDER_DIR not set. Exiting..."

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ 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"
2223

2324
permissions:
2425
contents: read
@@ -472,7 +473,7 @@ jobs:
472473
473474
- uses: dtolnay/rust-toolchain@83bdede770b06329615974cf8c786f845d824dfb # nightly
474475
with:
475-
toolchain: nightly
476+
toolchain: nightly-${{ env.RUST_NIGHTLY_VERSION }}
476477
components: rustfmt,clippy,miri
477478

478479
- name: Cache SIMICS Dependencies
@@ -578,7 +579,7 @@ jobs:
578579
echo "Downloading Rustup"
579580
Invoke-WebRequest -URI https://win.rustup.rs/x86_64 -OutFile C:\rustup-init.exe
580581
echo "Installing Rust"
581-
C:\rustup-init.exe --default-toolchain nightly --default-host x86_64-pc-windows-gnu -y
582+
C:\rustup-init.exe --default-toolchain nightly-${{ env.RUST_NIGHTLY_VERSION }} --default-host x86_64-pc-windows-gnu -y
582583
583584
- name: Cache SIMICS
584585
id: cache-simics-packages-windows

0 commit comments

Comments
 (0)