Merge pull request #118 from mathworks/maca

Support Apple Silicon Mac and update libmexclass
mathworks · May 3, 2024 · 5f50200 · 5f50200
2 parents b337854 + 18ee8fb
commit 5f50200
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -65,7 +65,10 @@ jobs:
               with:
                  select-by-folder: opentelemetry-matlab/test
     build-and-run-tests-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:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,7 +103,7 @@ set(LIBMEXCLASS_FETCH_CONTENT_NAME libmexclass)
 
 set(LIBMEXCLASS_FETCH_CONTENT_GIT_REPOSITORY "https://github.com/mathworks/libmexclass.git")
 
-set(LIBMEXCLASS_FETCH_CONTENT_GIT_TAG "bf16a65") 
+set(LIBMEXCLASS_FETCH_CONTENT_GIT_TAG "bc2b9f2") 
 
 set(LIBMEXCLASS_FETCH_CONTENT_SOURCE_SUBDIR "libmexclass/cpp")