Update runner config

Author: lrettig

.github/workflows/build_and_release.yml

@@ -5,10 +5,10 @@ on:
   push:
     tags:
       - "*"
-    # branches:
-    #   - main
-    # paths-ignore:
-    #   - README.md
+    branches:
+      - main
+    paths-ignore:
+      - README.md
 
 permissions:
   contents: write
@@ -41,26 +41,23 @@ jobs:
   build-and-release:
     needs: prepare
     timeout-minutes: 120
-    runs-on: ${{ matrix.runner.label }}
+    runs-on: ${{ matrix.runner }}
 
     strategy:
       matrix:
-        runner:
-          - label: self-hosted
-            os: macos
-          - label: [runs-on, runner=32cpu-linux-x64, "run-id=${{ github.run_id }}"]
+        include:
+          - runner: [runs-on, runner=32cpu-linux-x64, "run-id=${{ github.run_id }}"]
             os: ubuntu
-          - label: [runs-on, runner=32cpu-linux-arm64, "run-id=${{ github.run_id }}"]
+          - runner: [runs-on, runner=32cpu-linux-arm64, "run-id=${{ github.run_id }}"]
             os: ubuntu
-        # label: [self-hosted]
-        # include:
-        #   - label: runs-on
-        #     runner: 16cpu-linux-x64
-        #     run-id: "${{ github.run_id }}"
+          - runner: self-hosted
+            os: macos
+          - runner: macos-13
+            os: macos
 
     steps:
       - name: Free Disk Space (Ubuntu)
-        if: matrix.runner.os == 'ubuntu'
+        if: matrix.os == 'ubuntu'
         uses: jlumbroso/free-disk-space@main
         with:
           tool-cache: true
@@ -74,13 +71,13 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install ninja and riscv-tools
-        if: matrix.runner.os == 'ubuntu'
+        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.runner.os == 'macos'
+        if: matrix.os == 'macos'
         run: |
           brew install ninja
           brew tap riscv-software-src/riscv

.github/workflows/ci.yml

@@ -1,26 +1,19 @@
 name: CI
 
 on:
-  workflow_call:
   workflow_dispatch:
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        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: buildjet-32vcpu-ubuntu-2004
-          #   triple: x86_64-unknown-linux-gnu
-          # - os: buildjet-32vcpu-ubuntu-2204-arm
-          #   triple: aarch64-unknown-linux-gnu
-    runs-on: ${{ matrix.os }}
+        runner:
+          - [runs-on, runner=32cpu-linux-x64, "run-id=${{ github.run_id }}"]
+          - [runs-on, runner=32cpu-linux-arm64, "run-id=${{ github.run_id }}"]
+          - self-hosted
+          - macos-13
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Install nightly toolchain
         id: rustc-toolchain
@@ -50,12 +43,7 @@ jobs:
           path: athena
 
       - name: Build
-        run: GITHUB_ACTIONS=false ATHENA_BUILD_DIR=$GITHUB_WORKSPACE/toolchain cargo run --bin cargo-athena -- athena build-toolchain
+        run:
+          GITHUB_ACTIONS=false ATHENA_BUILD_DIR=$GITHUB_WORKSPACE/toolchain cargo run --bin cargo-athena -- athena
+          build-toolchain
         working-directory: athena
-
-      - name: Archive build output
-        uses: actions/upload-artifact@v3
-        with:
-          name: athena-rust-toolchain-${{ matrix.triple }}
-          path: |
-            athena/athena-rust-toolchain-${{ matrix.triple }}.tar.gz