Install Jolt RISC-V toolchain

If the toolchain is successfully installed, tests will not flake out.
manijeh-a · Jun 15, 2024 · 8c680b5 · 8c680b5
1 parent 8df78a1
commit 8c680b5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -22,9 +22,6 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: rustfmt
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
       - name: cargo fmt
         uses: actions-rs/cargo@v1
         with:
@@ -38,9 +35,6 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: clippy
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
       - name: cargo clippy
         uses: actions-rs/cargo@v1
         with:
@@ -52,10 +46,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
+      - name: Build and install Jolt
+        run: cargo install --path .
+      - name: Install Jolt RISC-V Rust toolchain
+        run: jolt install-toolchain
       - name: Install nextest
         uses: taiki-e/install-action@nextest
-      - name: run jolt-core tests
+      - name: Run jolt-core tests
         run: cargo nextest run -p jolt-core
diff --git a/.jolt.rust.toolchain-tag b/.jolt.rust.toolchain-tag
@@ -0,0 +1 @@
+nightly-3c5f0ec3f4f98a2d211061a83bade8d62c6a6135
diff --git a/jolt-core/src/host/toolchain.rs b/jolt-core/src/host/toolchain.rs
@@ -11,7 +11,7 @@ use indicatif::{ProgressBar, ProgressStyle};
 use reqwest::Client;
 use tokio::runtime::Runtime;
 
-const TOOLCHAIN_TAG: &str = "nightly-3c5f0ec3f4f98a2d211061a83bade8d62c6a6135";
+const TOOLCHAIN_TAG: &str = include_str!("../../../.jolt.rust.toolchain-tag");
 const DOWNLOAD_RETRIES: usize = 5;
 const DELAY_BASE_MS: u64 = 500;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		nightly-3c5f0ec3f4f98a2d211061a83bade8d62c6a6135