build and publish on both Intel and Apple Silicon Mac

mathworks · May 2, 2024 · 18ee8fb · 18ee8fb
1 parent cbd930d
commit 18ee8fb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -68,7 +68,7 @@ jobs:
         runs-on: ${{ matrix.os }}
         strategy:
           matrix:
-            os: [macos-12, macos-14]   # runs on Mac with both Intel and Apple Silicon processors
+            os: [macos-13, macos-14]   # runs on Mac with both Intel (macos-13) and Apple Silicon (macos-14) processors
         env:
             OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
         steps:

diff --git a/.github/workflows/publish_mltbx.yml b/.github/workflows/publish_mltbx.yml
@@ -65,7 +65,10 @@ jobs:
                 name: otel-matlab-windows.tar.gz
                 path: ${{ github.workspace }}/otel-matlab-windows.tar.gz
     build-macos:
-        runs-on: macos-latest
+        runs-on: ${{ matrix.os }}
+        strategy:
+          matrix:
+            os: [macos-13, macos-14]   # runs on Mac with both Intel (macos-13) and Apple Silicon (macos-14) processors
         env:
             OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
         steps:
@@ -86,12 +89,12 @@ jobs:
                   cmake --build build --config Release --target install
             - name: Compress into single artifact
               working-directory: ${{ github.workspace }}
-              run: tar -czf otel-matlab-macos.tar.gz otel_matlab_install
+              run: tar -czf otel-matlab-${{ matrix.os }}.tar.gz otel_matlab_install
             - name: Upload artifacts
               uses: actions/upload-artifact@v2
               with: 
-                name: otel-matlab-macos.tar.gz
-                path: ${{ github.workspace }}/otel-matlab-macos.tar.gz
+                name: otel-matlab-${{ matrix.os }}.tar.gz
+                path: ${{ github.workspace }}/otel-matlab-${{ matrix.os }}.tar.gz
     package-mltbx:
         name: Package MATLAB Toolbox (MLTBX) Files
         runs-on: ubuntu-20.04
@@ -120,7 +123,8 @@ jobs:
               run: |
                   mv artifacts-downloaded/*/*.tar.gz .
                   tar -xzvf otel-matlab-ubuntu.tar.gz
-                  tar -xzvf otel-matlab-macos.tar.gz
+                  tar -xzvf otel-matlab-macos-13.tar.gz
+                  tar -xzvf otel-matlab-macos-14.tar.gz
                   tar -xzvf otel-matlab-windows.tar.gz
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v1