Enable macOS workflows

Author: lrettig

.github/workflows/build_and_release.yml

@@ -46,7 +46,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          # - macos-latest
+          - macos-latest
 
     steps:
       - name: Free Disk Space (Ubuntu)
@@ -63,16 +63,18 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Install ninja
+      - name: Install ninja and riscv-tools
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt update
-          sudo apt-get -y install ninja-build
+          sudo apt-get -y install ninja-build binutils-riscv64-unknown-elf gcc-riscv64-unknown-elf
 
-      - name: Install ninja
+      - name: Install ninja and riscv-tools
         if: contains(matrix.os, 'macos')
         run: |
           brew install ninja
+          brew tap riscv-software-src/riscv
+          brew install riscv-tools
 
       - name: Download source
         run: ./clone.sh

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
         include:
           - os: ubuntu-latest
             triple: x86_64-unknown-linux-gnu
-          # - os: macos-14
-          #   triple: aarch64-apple-darwin
-          # - os: macos-13
-          #   triple: x86_64-apple-darwin
+          - os: macos-14
+            triple: aarch64-apple-darwin
+          - os: macos-13
+            triple: x86_64-apple-darwin
           # - os: buildjet-32vcpu-ubuntu-2004
           #   triple: x86_64-unknown-linux-gnu
           # - os: buildjet-32vcpu-ubuntu-2204-arm

build.sh

@@ -10,8 +10,6 @@ touch /tmp/riscv32em-athena-zkvm-elf.json
 
 # Will create component archives (dists) ./rust/build/dist
 cd rust
-#RUSTFLAGS="-C link-arg=-L$HOME/compiler_rt_build_riscv32em-athena-zkvm-elf/lib/baremetal" \
-#LIBRARY_PATH="$HOME/compiler_rt_build_riscv32em-athena-zkvm-elf/lib/baremetal" \
 RUST_TARGET_PATH="/tmp" \
 CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" \
 CFLAGS_riscv32em_athena_zkvm_elf="-ffunction-sections -fdata-sections -fPIC -march=rv32em -mabi=ilp32e" \