chore: fix the guest compiler's rust toolchain version (#936)

* chore: fix the guest compiler's rust toolchain version We must use nightly for -Z but we fix a nightly version for stability. * chore: fix CI
openvm-org · Dec 4, 2024 · 138157b · 138157b
1 parent ec4adb6
commit 138157b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/benchmark-call.yml b/.github/workflows/benchmark-call.yml
@@ -122,11 +122,11 @@ jobs:
           arch=$(uname -m)
           case $arch in
             arm64|aarch64)
-              rustup component add rust-src --toolchain nightly-aarch64-unknown-linux-gnu
+              rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
               S5CMD_BIN="s5cmd_2.2.2_linux_arm64.deb"
               ;;
             x86_64|amd64)
-              rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
+              rustup component add rust-src --toolchain nightly-2024-10-30-x86_64-unknown-linux-gnu
               S5CMD_BIN="s5cmd_2.2.2_linux_amd64.deb"
               ;;
             *)

diff --git a/.github/workflows/ecc.yml b/.github/workflows/ecc.yml
@@ -44,17 +44,17 @@ jobs:
       - name: Run ecc-circuits crate tests
         working-directory: extensions/ecc/circuit
         run: |
-          cargo nextest run --cargo-profile=fast 
+          cargo nextest run --cargo-profile=fast
 
       - name: Run pairing-circuits crate tests
         working-directory: extensions/pairing/circuit
         run: |
-          RUST_MIN_STACK=8388608 cargo nextest run --cargo-profile=fast 
+          RUST_MIN_STACK=8388608 cargo nextest run --cargo-profile=fast
 
       - name: Install cargo-axiom
         working-directory: crates/cargo-axiom
         run: |
-          rustup component add rust-src --toolchain nightly-aarch64-unknown-linux-gnu
+          rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
           cargo install --force --locked --path .
 
       - name: Build axvm-ecc-guest crate for axvm

diff --git a/.github/workflows/riscv.yml b/.github/workflows/riscv.yml
@@ -49,5 +49,5 @@ jobs:
       - name: Run RISC-V test vector tests
         working-directory: crates/toolchain/tests
         run: |
-          rustup component add rust-src --toolchain nightly-aarch64-unknown-linux-gnu
+          rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
           cargo nextest run --cargo-profile=fast --run-ignored only -- test_rv32im_riscv_vector_runtime
diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
@@ -39,11 +39,11 @@ jobs:
       - name: Run transpiler tests
         working-directory: crates/toolchain/transpiler
         run: |
-          rustup component add rust-src --toolchain nightly-aarch64-unknown-linux-gnu
+          rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
           cargo nextest run --cargo-profile=fast
 
       - name: Run toolchain tests
         working-directory: crates/toolchain/tests
         run: |
-          rustup component add rust-src --toolchain nightly-aarch64-unknown-linux-gnu
+          rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
           cargo nextest run --cargo-profile=fast
diff --git a/crates/cargo-axiom/src/lib.rs b/crates/cargo-axiom/src/lib.rs
@@ -5,7 +5,7 @@ use std::process::{Command, Stdio};
 
 use eyre::{Context, Result};
 
-pub const RUSTUP_TOOLCHAIN_NAME: &str = "nightly";
+pub const RUSTUP_TOOLCHAIN_NAME: &str = "nightly-2024-10-30";
 
 pub const AXVM_VERSION_MESSAGE: &str = concat!(
     "axvm",

diff --git a/crates/toolchain/build/src/lib.rs b/crates/toolchain/build/src/lib.rs
@@ -21,7 +21,7 @@ pub use self::config::{DockerOptions, GuestOptions};
 mod config;
 
 #[allow(dead_code)]
-const RUSTUP_TOOLCHAIN_NAME: &str = "axiom";
+const RUSTUP_TOOLCHAIN_NAME: &str = "nightly-2024-10-30";
 
 /// Returns the given cargo Package from the metadata in the Cargo.toml manifest
 /// within the provided `manifest_dir`.
@@ -136,7 +136,7 @@ fn sanitized_cmd(tool: &str) -> Command {
 /// command in an environment suitable for targeting the zkvm guest.
 pub fn cargo_command(subcmd: &str, rust_flags: &[&str]) -> Command {
     let rustc = sanitized_cmd("rustup")
-        .args(["+nightly", "which", "rustc"]) // TODO: switch +nightly to +axiom
+        .args(["+nightly-2024-10-30", "which", "rustc"]) // TODO: switch +nightly to +axiom
         .output()
         .expect("rustup failed to find nightly toolchain")
         .stdout;
@@ -147,7 +147,12 @@ pub fn cargo_command(subcmd: &str, rust_flags: &[&str]) -> Command {
 
     let mut cmd = sanitized_cmd("cargo");
     // TODO[jpw]: remove +nightly
-    let mut args = vec!["+nightly", subcmd, "--target", "riscv32im-risc0-zkvm-elf"];
+    let mut args = vec![
+        "+nightly-2024-10-30",
+        subcmd,
+        "--target",
+        "riscv32im-risc0-zkvm-elf",
+    ];
 
     if std::env::var("AXIOM_BUILD_LOCKED").is_ok() {
         args.push("--locked");