Run tests on arm and intel

rwx-research · Feb 2, 2024 · 60707a1 · 60707a1
1 parent c42b3a8
commit 60707a1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 27 deletions.
diff --git a/.github/workflows/abq-ci.yml b/.github/workflows/abq-ci.yml
@@ -4,28 +4,31 @@ on:
 
 jobs:
   test_abq:
-    runs-on: macos-12
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: abq
             version: "1.7.4"
+            os: macos-12 # intel
+          - name: abq
+            version: "1.7.4"
+            os: macos-14 # arm
+          - name: abq@1
+            version: "1.7.4"
+            os: macos-12 # intel
           - name: abq@1
             version: "1.7.4"
+            os: macos-14 # arm
     steps:
       - uses: actions/checkout@v3
-        with:
-          path: homebrew-fake-tap-name # give it a fake name so we don't accidentally pull the one from github
-
-      - name: move it to the right directory
-        run: |
-          mkdir -p homebrew-tap /usr/local/Homebrew/Library/Taps/rwx-research
-          mv homebrew-fake-tap-name /usr/local/Homebrew/Library/Taps/rwx-research/
 
       - name: Install abq & run it
         run: |
           set -o pipefail
-          brew install rwx-research/fake-tap-name/${{ matrix.name }} 2>&1 | tee install-output.txt
+          ! command -v abq
+          brew install ./Formula/${{ matrix.name }} 2>&1 | tee install-output.txt
           abq --version | grep ${{ matrix.version }}
 
       - name: Ensure the integrity was verified

diff --git a/.github/workflows/captain-ci.yml b/.github/workflows/captain-ci.yml
@@ -4,28 +4,31 @@ on:
 
 jobs:
   test_captain:
-    runs-on: macos-12
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: captain
             version: "1.11.7"
+            os: macos-12 # intel
+          - name: captain
+            version: "1.11.7"
+            os: macos-14 # arm
+          - name: captain@1
+            version: "1.11.7"
+            os: macos-12 # intel
           - name: captain@1
             version: "1.11.7"
+            os: macos-14 # arm
     steps:
       - uses: actions/checkout@v3
-        with:
-          path: homebrew-fake-tap-name # give it a fake name so we don't accidentally pull the one from github
-
-      - name: move it to the right directory
-        run: |
-          mkdir -p homebrew-tap /usr/local/Homebrew/Library/Taps/rwx-research
-          mv homebrew-fake-tap-name /usr/local/Homebrew/Library/Taps/rwx-research/
 
       - name: Install captain & run it
         run: |
           set -o pipefail
-          brew install rwx-research/fake-tap-name/${{ matrix.name }} 2>&1 | tee install-output.txt
+          ! command -v captain
+          brew install ./Formula/${{ matrix.name }} 2>&1 | tee install-output.txt
           captain --version | grep ${{ matrix.version }}
 
       - name: Ensure the integrity was verified

diff --git a/.github/workflows/mint-ci.yml b/.github/workflows/mint-ci.yml
@@ -4,26 +4,25 @@ on:
 
 jobs:
   test_mint:
-    runs-on: macos-12
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: mint
             version: "0.0.14"
+            os: macos-12 # intel
+          - name: mint
+            version: "0.0.14"
+            os: macos-14 # arm
     steps:
       - uses: actions/checkout@v3
-        with:
-          path: homebrew-fake-tap-name # give it a fake name so we don't accidentally pull the one from github
-
-      - name: move it to the right directory
-        run: |
-          mkdir -p homebrew-tap /usr/local/Homebrew/Library/Taps/rwx-research
-          mv homebrew-fake-tap-name /usr/local/Homebrew/Library/Taps/rwx-research/
 
       - name: Install mint & run it
         run: |
           set -o pipefail
-          brew install rwx-research/fake-tap-name/${{ matrix.name }} 2>&1 | tee install-output.txt
+          ! command -v mint
+          brew install ./Formula/${{ matrix.name }} 2>&1 | tee install-output.txt
           mint --version | grep ${{ matrix.version }}
 
       - name: Ensure the integrity was verified