From 2637ab7dc68abbad2921a6b43442a33d00285aa4 Mon Sep 17 00:00:00 2001 From: duncanpo Date: Thu, 2 May 2024 13:47:10 -0400 Subject: [PATCH 1/3] Update libmexclass --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8777ada..2010fbe 100644 --- 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") From cbd930d10a5af0fbaf2485c49a045cb6bab449fe Mon Sep 17 00:00:00 2001 From: duncanpo Date: Thu, 2 May 2024 14:42:34 -0400 Subject: [PATCH 2/3] Run on Mac with both Intel and Apple Silicon processors --- .github/workflows/build_and_test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2512cf5..9012658 100644 --- 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-12, macos-14] # runs on Mac with both Intel and Apple Silicon processors env: OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" steps: From 18ee8fb0d4c762f45806940f51f6ed38e34b21f8 Mon Sep 17 00:00:00 2001 From: duncanpo Date: Thu, 2 May 2024 15:58:08 -0400 Subject: [PATCH 3/3] build and publish on both Intel and Apple Silicon Mac --- .github/workflows/build_and_test.yml | 2 +- .github/workflows/publish_mltbx.yml | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9012658..c908b4f 100644 --- 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 index 37a556a..79b7a39 100644 --- 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