Skip to content

Commit 5f50200

Browse files
authored
Merge pull request #118 from mathworks/maca
Support Apple Silicon Mac and update libmexclass
2 parents b337854 + 18ee8fb commit 5f50200

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

.github/workflows/build_and_test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ jobs:
6565
with:
6666
select-by-folder: opentelemetry-matlab/test
6767
build-and-run-tests-macos:
68-
runs-on: macos-latest
68+
runs-on: ${{ matrix.os }}
69+
strategy:
70+
matrix:
71+
os: [macos-13, macos-14] # runs on Mac with both Intel (macos-13) and Apple Silicon (macos-14) processors
6972
env:
7073
OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
7174
steps:

.github/workflows/publish_mltbx.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ jobs:
6565
name: otel-matlab-windows.tar.gz
6666
path: ${{ github.workspace }}/otel-matlab-windows.tar.gz
6767
build-macos:
68-
runs-on: macos-latest
68+
runs-on: ${{ matrix.os }}
69+
strategy:
70+
matrix:
71+
os: [macos-13, macos-14] # runs on Mac with both Intel (macos-13) and Apple Silicon (macos-14) processors
6972
env:
7073
OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
7174
steps:
@@ -86,12 +89,12 @@ jobs:
8689
cmake --build build --config Release --target install
8790
- name: Compress into single artifact
8891
working-directory: ${{ github.workspace }}
89-
run: tar -czf otel-matlab-macos.tar.gz otel_matlab_install
92+
run: tar -czf otel-matlab-${{ matrix.os }}.tar.gz otel_matlab_install
9093
- name: Upload artifacts
9194
uses: actions/upload-artifact@v2
9295
with:
93-
name: otel-matlab-macos.tar.gz
94-
path: ${{ github.workspace }}/otel-matlab-macos.tar.gz
96+
name: otel-matlab-${{ matrix.os }}.tar.gz
97+
path: ${{ github.workspace }}/otel-matlab-${{ matrix.os }}.tar.gz
9598
package-mltbx:
9699
name: Package MATLAB Toolbox (MLTBX) Files
97100
runs-on: ubuntu-20.04
@@ -120,7 +123,8 @@ jobs:
120123
run: |
121124
mv artifacts-downloaded/*/*.tar.gz .
122125
tar -xzvf otel-matlab-ubuntu.tar.gz
123-
tar -xzvf otel-matlab-macos.tar.gz
126+
tar -xzvf otel-matlab-macos-13.tar.gz
127+
tar -xzvf otel-matlab-macos-14.tar.gz
124128
tar -xzvf otel-matlab-windows.tar.gz
125129
- name: Install MATLAB
126130
uses: matlab-actions/setup-matlab@v1

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ set(LIBMEXCLASS_FETCH_CONTENT_NAME libmexclass)
103103

104104
set(LIBMEXCLASS_FETCH_CONTENT_GIT_REPOSITORY "https://github.com/mathworks/libmexclass.git")
105105

106-
set(LIBMEXCLASS_FETCH_CONTENT_GIT_TAG "bf16a65")
106+
set(LIBMEXCLASS_FETCH_CONTENT_GIT_TAG "bc2b9f2")
107107

108108
set(LIBMEXCLASS_FETCH_CONTENT_SOURCE_SUBDIR "libmexclass/cpp")
109109

0 commit comments

Comments
 (0)