More caching, more cleanup

Author: lrettig

.github/workflows/build_and_release.yml

@@ -48,12 +48,16 @@ jobs:
         include:
           - runner: [runs-on, runner=32cpu-linux-x64, "run-id=${{ github.run_id }}"]
             os: ubuntu
+            cachekey: ubuntu-x86
           - runner: [runs-on, runner=32cpu-linux-arm64, "run-id=${{ github.run_id }}"]
             os: ubuntu
+            cachekey: ubuntu-arm64
           - runner: self-hosted
             os: macos
+            cachekey: macos-arm64
           - runner: macos-13
             os: macos
+            cachekey: macos-x86
 
     steps:
       - name: Free Disk Space (Ubuntu)
@@ -70,6 +74,17 @@ jobs:
 
       - uses: actions/checkout@v4
 
+      - uses: actions/cache@v4
+        name: Cache Rust toolchain
+        with:
+          path: |
+            rust/build
+            rust/library
+            rust/src/doc
+            rust/src/llvm-project
+            rust/src/tools
+          key: ${{ matrix.cachekey }}-buildtoolchain-${{ env.RUST_COMMIT }}
+
       - name: Install ninja
         uses: lukka/get-cmake@v3.30.2
 

build.sh

@@ -5,8 +5,8 @@ set -euo pipefail
 source config.sh
 
 # Fail fast if these tools aren't properly installed and in the path
-need_cmd clang
-need_cmd clang++
+# need_cmd clang
+# need_cmd clang++
 
 # Rust requires a custom target file to exist for our custom target as part of the bootstrap build,
 # but it doesn't actually look at the contents.
@@ -19,9 +19,6 @@ export CFLAGS_riscv32em_athena_zkvm_elf="-ffunction-sections -fdata-sections -fP
 # Set Rust flags
 export CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic"
 
-# Prevent the build system from adding --target flag
-#export RUSTC_TARGET_ARG=""
-
 # Will create component archives (dists) ./rust/build/dist
 cd rust
 ./x build --stage 2

patches/config.ci.toml

@@ -7,9 +7,9 @@ tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
 configure-args = []
 cargo-native-static = true
 
-[target.riscv32em-athena-zkvm-elf]
-cc = "clang"
-cxx = "clang++"
+# [target.riscv32em-athena-zkvm-elf]
+# cc = "clang"
+# cxx = "clang++"
 
 [rust]
 lld = true

patches/config.toml

@@ -6,9 +6,9 @@ extended = true
 tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
 configure-args = []
 
-[target.riscv32em-athena-zkvm-elf]
-cc = "clang"
-cxx = "clang++"
+# [target.riscv32em-athena-zkvm-elf]
+# cc = "clang"
+# cxx = "clang++"
 
 [rust]
 lld = true