chore: condense

Opentrons · Feb 21, 2024 · 5312dbe · 5312dbe
1 parent b1c06dc
commit 5312dbe
Showing 1 changed file with 34 additions and 55 deletions.
diff --git a/.github/workflows/build-mosquitto.yaml b/.github/workflows/build-mosquitto.yaml
@@ -51,61 +51,40 @@ jobs:
           path: mosquitto.exe
 
 
-  build-mac-x86:
-    runs-on: macos-13
-    steps:
-      - name: Set up build environment
-        run: |
-          brew install cmake
-          brew install openssl
-          brew install libwebsockets
-          brew install ossp-uuid
-          brew install wget
+build-mac:
+  strategy:
+    matrix:
+      include:
+        - os: macos-13
+          arch: x86-64
+        # Mac M1 is in beta and is labeled as macos-14
+        - os: macos-14
+          arch: arm64
+  runs-on: ${{ matrix.os }}
 
-      - name: Get Mosquitto Source
-        run: |
-          wget https://mosquitto.org/files/source/mosquitto-2.0.18.tar.gz
-          tar xvf mosquitto-2.0.18.tar.gz
-          mv mosquitto-2.0.18 mosquitto
-          
-      # https://github.com/eclipse/mosquitto/issues/2858#issuecomment-1777978779
-      - name: Build Mosquitto
-        run: |
-          cd mosquitto
-          cmake  -DCMAKE_MODULE_LINKER_FLAGS="-undefined dynamic_lookup" .
-          WITH_DOCS=no cmake --build .
+  steps:
+    - name: Set up build environment
+      run: |
+        brew install cmake
+        brew install openssl
+        brew install libwebsockets
+        brew install ossp-uuid
+        brew install wget
 
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: mosquitto-binary-mac-x86-64
-          path: mosquitto/src/mosquitto
+    - name: Get Mosquitto Source
+      run: |
+        wget https://mosquitto.org/files/source/mosquitto-2.0.18.tar.gz
+        tar xvf mosquitto-2.0.18.tar.gz
+        mv mosquitto-2.0.18 mosquitto
+        
+    - name: Build Mosquitto
+      run: |
+        cd mosquitto
+        cmake -DCMAKE_MODULE_LINKER_FLAGS="-undefined dynamic_lookup" .
+        WITH_DOCS=no cmake --build .
 
-  build-mac-m1:
-    runs-on: macos-14
-    steps:
-      - name: Set up build environment
-        run: |
-          brew install cmake
-          brew install openssl
-          brew install libwebsockets
-          brew install ossp-uuid
-          brew install wget
-
-      - name: Get Mosquitto Source
-        run: |
-          wget https://mosquitto.org/files/source/mosquitto-2.0.18.tar.gz
-          tar xvf mosquitto-2.0.18.tar.gz
-          mv mosquitto-2.0.18 mosquitto
-          
-      - name: Build Mosquitto
-        run: |
-          cd mosquitto
-          cmake  -DCMAKE_MODULE_LINKER_FLAGS="-undefined dynamic_lookup" .
-          WITH_DOCS=no cmake --build .
-
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: mosquitto-binary-mac-m1
-          path: mosquitto/src/mosquitto
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: mosquitto-binary-mac-${{ matrix.arch }}
+        path: mosquitto/src/mosquitto