Merge branch 'main' into capossele/ffi-build

risc0 · May 17, 2024 · e598392 · e598392
2 parents f8f3695 + 53d849b
commit e598392
Show file tree

Hide file tree

Showing 13 changed files with 390 additions and 393 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,8 +15,8 @@ concurrency:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   RUST_BACKTRACE: "1"
-  RISC0_CRATE_VERSION: "^0.20"
-  RISC0_TOOLCHAIN_VERSION: v2024-01-31.1
+  RISC0_CRATE_VERSION: "^0.21"
+  RISC0_TOOLCHAIN_VERSION: v2024-02-08.1
 
 jobs:
   test:
@@ -30,9 +30,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      
+
       - name: Install rust
-        uses: risc0/risc0/.github/actions/rustup@release-0.20
+        uses: risc0/risc0/.github/actions/rustup@release-0.21
 
       - name: Install Foundry
         uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f
@@ -76,7 +76,7 @@ jobs:
           submodules: recursive
 
       - name: Install rust
-        uses: risc0/risc0/.github/actions/rustup@release-0.19
+        uses: risc0/risc0/.github/actions/rustup@release-0.21
 
       - name: Install Foundry
         uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f
@@ -114,7 +114,7 @@ jobs:
           submodules: recursive
 
       - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@release-0.20
+        uses: risc0/risc0/.github/actions/rustup@release-0.21
 
       - name: install cargo-sort
         uses: risc0/cargo-install@v1

diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,4 @@
 [submodule "lib/risc0-ethereum"]
 	path = lib/risc0-ethereum
 	url = https://github.com/risc0/risc0-ethereum
+	branch = release-0.9