Simplify build further, enable GHA caching

Author: lrettig

.github/workflows/ci.yml

@@ -50,6 +50,30 @@ jobs:
           ref: main
           path: athena
 
+      - name: Source config.sh and export RUST_COMMIT
+        run: |
+          source toolchain/config.sh
+          echo "Using Rust commit: $RUST_COMMIT"
+          echo "RUST_COMMIT=$RUST_COMMIT" >> $GITHUB_ENV
+
+      - uses: actions/cache@v4
+        name: Cache Athena build
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            athena/target/
+          key: ${{ matrix.os }}-athenabuild-${{ hashFiles('athena/**/Cargo.lock') }}
+
+      - uses: actions/cache@v4
+        name: Cache Rust toolchain
+        with:
+          path: |
+            toolchain/rust/
+          key: ${{ matrix.os }}-rusttoolchain-${{ env.RUST_COMMIT }}
+
       - name: Build
         run:
           GITHUB_ACTIONS=false ATHENA_BUILD_DIR=$GITHUB_WORKSPACE/toolchain cargo run --bin cargo-athena -- athena

build.sh

@@ -14,18 +14,19 @@ touch /tmp/riscv32em-athena-zkvm-elf.json
 export RUST_TARGET_PATH="/tmp"
 
 # Set environment variables to override compiler flags
-export CC_riscv32em_athena_zkvm_elf="clang"
-export CXX_riscv32em_athena_zkvm_elf="clang++"
+#export CC_riscv32em_athena_zkvm_elf="clang"
+#export CXX_riscv32em_athena_zkvm_elf="clang++"
 
 # Explicitly set CFLAGS without the problematic flags
 export CFLAGS_riscv32em_athena_zkvm_elf="-ffunction-sections -fdata-sections -fPIC -target riscv32-unknown-elf"
-export CXXFLAGS_riscv32em_athena_zkvm_elf="$CFLAGS_riscv32em_athena_zkvm_elf"
+#export CXXFLAGS_riscv32em_athena_zkvm_elf="$CFLAGS_riscv32em_athena_zkvm_elf"
 
 # Set Rust flags
-export CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic -Clink-arg=-march=rv32em -Clink-arg=-mabi=ilp32e"
+export CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic"
+# export CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic -Clink-arg=-march=rv32em -Clink-arg=-mabi=ilp32e"
 
 # Override the default target for compiler-rt
-export COMPILER_RT_DEFAULT_TARGET_TRIPLE="riscv32-unknown-elf"
+# export COMPILER_RT_DEFAULT_TARGET_TRIPLE="riscv32-unknown-elf"
 
 # Prevent the build system from adding --target flag
 export RUSTC_TARGET_ARG=""