Cleanup and simplification

Simplify workflows
It looks like clang works out of the box. Try not installing risc-v
toolchain after all.

Author: lrettig

.github/workflows/build_and_release.yml

@@ -70,18 +70,8 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Install ninja and riscv-tools
-        if: matrix.os == 'ubuntu'
-        run: |
-          sudo apt update
-          sudo apt-get -y install ninja-build gcc-riscv64-unknown-elf
-
-      - name: Install ninja and riscv-tools
-        if: matrix.os == 'macos'
-        run: |
-          brew install ninja
-          brew tap riscv-software-src/riscv
-          brew install riscv-tools
+      - name: Install ninja
+        uses: lukka/[email protected]
 
       - name: Download source
         run: ./clone.sh
@@ -92,7 +82,7 @@ jobs:
       - name: Build toolchain
         run: ./build.sh
 
-      # Push in the Github environment variable the name of the artifact
+      # Push the name of the artifact into the Github environment variable
       - run: ./config.sh -artifact_name
 
       - name: Package toolchain

.github/workflows/ci.yml

@@ -22,6 +22,7 @@ jobs:
           - runner: macos-13
             os: macos
     runs-on: ${{ matrix.runner }}
+    timeout-minutes: 120
     steps:
       - name: Install nightly toolchain
         id: rustc-toolchain
@@ -43,24 +44,12 @@ jobs:
           path: toolchain
 
       - name: Check out athenavm/athena
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: athenavm/athena
           ref: main
           path: athena
 
-      - name: Install riscv-tools
-        if: matrix.os == 'ubuntu'
-        run: |
-          sudo apt update
-          sudo apt-get -y install gcc-riscv64-unknown-elf
-
-      - name: Install riscv-tools
-        if: matrix.os == 'macos'
-        run: |
-          brew tap riscv-software-src/riscv
-          brew install riscv-tools
-
       - name: Build
         run:
           GITHUB_ACTIONS=false ATHENA_BUILD_DIR=$GITHUB_WORKSPACE/toolchain cargo run --bin cargo-athena -- athena

build.sh

@@ -5,12 +5,13 @@ set -euo pipefail
 source config.sh
 
 # Fail fast if these tools aren't properly installed and in the path
-need_cmd riscv32-unknown-elf-clang
-need_cmd riscv32-unknown-elf-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.
 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"
@@ -26,9 +27,6 @@ export CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic -C
 # Override the default target for compiler-rt
 export COMPILER_RT_DEFAULT_TARGET_TRIPLE="riscv32-unknown-elf"
 
-# Force the use of our custom target spec
-export RUST_TARGET_PATH="/tmp"
-
 # Prevent the build system from adding --target flag
 export RUSTC_TARGET_ARG=""