From f41e1e2c833a3b4dcaa83199c7628a72baa44ca0 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 31 Oct 2023 10:43:46 -0400 Subject: [PATCH 01/21] Added Windows build-and-run-tests job in build.yml file --- .github/workflows/build.yml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7e5ee2..ca5e051 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: jobs: - build-and-run-tests: + build-and-run-tests-ubuntu: runs-on: ubuntu-latest env: OPENTELEMETRY_CPP_INSTALL: "${{ github.workspace }}/otel_cpp_install" @@ -40,3 +40,34 @@ jobs: uses: matlab-actions/run-tests@v1 with: select-by-folder: opentelemetry-matlab/test + build-and-run-tests-windows: + runs-on: windows-2022 + env: + OPENTELEMETRY_CPP_INSTALL: "${{ github.workspace }}/otel_cpp_install" + OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" + OPENTELEMETRY_COLLECTOR_INSTALL: "${{ github.workspace }}/otelcol" + steps: + - name: Download OpenTelemetry-Matlab source + uses: actions/checkout@v3 + with: + path: opentelemetry-matlab + - name: Install MATLAB + uses: matlab-actions/setup-matlab@v1 + - name: Download OpenTelemetry Collector binary + run: | + mkdir otelcol && cd otelcol + wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.83.0/otelcol_0.83.0_windows_amd64.tar.gz -outfile otelcol.tar.gz + tar -xzf .\otelcol.tar.gz + - name: Build OpenTelemetry-Matlab + run: | + cd opentelemetry-matlab + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake --build build --config Release --target install + - name: Run tests + env: + # Add the installation directory to the MATLAB Search Path by + # setting the MATLABPATH environment variable. + MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + uses: matlab-actions/run-tests@v1 + with: + select-by-folder: opentelemetry-matlab/test \ No newline at end of file From 8603ca3eb86b979233e8e25fdf054345086b79d0 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 31 Oct 2023 10:55:01 -0400 Subject: [PATCH 02/21] Added wget install to fix Windows build issues --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca5e051..1be4e48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: with: select-by-folder: opentelemetry-matlab/test build-and-run-tests-windows: - runs-on: windows-2022 + runs-on: windows-latest env: OPENTELEMETRY_CPP_INSTALL: "${{ github.workspace }}/otel_cpp_install" OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" @@ -53,6 +53,8 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v1 + - name: Install wget + choco install wget - name: Download OpenTelemetry Collector binary run: | mkdir otelcol && cd otelcol From db6c541e1246331f3da84090ac1267e3d9384457 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 31 Oct 2023 10:57:19 -0400 Subject: [PATCH 03/21] Adjusted wget install to use run: | yml format --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1be4e48..c5974d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,8 @@ jobs: - name: Install MATLAB uses: matlab-actions/setup-matlab@v1 - name: Install wget - choco install wget + run: | + choco install wget - name: Download OpenTelemetry Collector binary run: | mkdir otelcol && cd otelcol From f2f35c5b3e8fc63a7d9c2f5e0cf6a817dc93ba02 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 31 Oct 2023 11:45:13 -0400 Subject: [PATCH 04/21] Troubleshooting Windows Build file, adding Verbose to tar execution --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5974d7..7d0c887 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,12 +55,12 @@ jobs: uses: matlab-actions/setup-matlab@v1 - name: Install wget run: | - choco install wget + choco install wget --no-progress - name: Download OpenTelemetry Collector binary run: | mkdir otelcol && cd otelcol wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.83.0/otelcol_0.83.0_windows_amd64.tar.gz -outfile otelcol.tar.gz - tar -xzf .\otelcol.tar.gz + tar xzvf otelcol.tar.gz - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab From 83afd81da14bef9e571f4dac6992c548b20e6396 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 31 Oct 2023 14:46:09 -0400 Subject: [PATCH 05/21] Adjust wget command to fix failures in OpenTelemetry Colelctor binary download for windows --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d0c887..e1fc9b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: - name: Download OpenTelemetry Collector binary run: | mkdir otelcol && cd otelcol - wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.83.0/otelcol_0.83.0_windows_amd64.tar.gz -outfile otelcol.tar.gz + wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.83.0/otelcol_0.83.0_windows_amd64.tar.gz -O otelcol.tar.gz tar xzvf otelcol.tar.gz - name: Build OpenTelemetry-Matlab run: | From 55e607b0d0cb3b3a49d039638d034344f9ca8858 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Wed, 1 Nov 2023 14:44:20 -0400 Subject: [PATCH 06/21] Merged with main and updated Windows build to reflect updated changes --- .github/workflows/build.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e91bde7..8c76f34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,9 +36,7 @@ jobs: build-and-run-tests-windows: runs-on: windows-latest env: - OPENTELEMETRY_CPP_INSTALL: "${{ github.workspace }}/otel_cpp_install" OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" - OPENTELEMETRY_COLLECTOR_INSTALL: "${{ github.workspace }}/otelcol" steps: - name: Download OpenTelemetry-Matlab source uses: actions/checkout@v3 @@ -46,18 +44,10 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v1 - - name: Install wget - run: | - choco install wget --no-progress - - name: Download OpenTelemetry Collector binary - run: | - mkdir otelcol && cd otelcol - wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.83.0/otelcol_0.83.0_windows_amd64.tar.gz -O otelcol.tar.gz - tar xzvf otelcol.tar.gz - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install - name: Run tests env: From 35037017a987b633bafa92054d20d6ea31f46e79 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 7 Nov 2023 10:33:51 -0500 Subject: [PATCH 07/21] Remove examples on Windows build job due to Matlab Compiler related errors --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c76f34..ca3652d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install - name: Run tests env: From 4e362fbf128831c6bf2754594280cab0c2be7e47 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 7 Nov 2023 11:40:39 -0500 Subject: [PATCH 08/21] Adding Verbose flag on failing cmake command for more info --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca3652d..8e957fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: run: | cd opentelemetry-matlab cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} - cmake --build build --config Release --target install + cmake --build build --config Release --target install -v - name: Run tests env: # Add the installation directory to the MATLAB Search Path by From 53a0c396000d84b7f23010c609bd2b5a77f8b339 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Thu, 9 Nov 2023 14:41:20 -0500 Subject: [PATCH 09/21] Checking Github-Actions cmake version --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e957fe..88c6f19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,6 +47,7 @@ jobs: - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab + cmake --version cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install -v - name: Run tests From b7aa80c17c13e85cbe946e3d81b98bb967bf916a Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Thu, 9 Nov 2023 15:42:34 -0500 Subject: [PATCH 10/21] Adding libMatlabDataArray Dependency in Cmake --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b9f509..7937690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,7 +317,8 @@ if(WIN32) FILE(GLOB ZLIB_RUNTIME ${ZLIB_INCLUDE_DIRS}/../bin/*.dll) set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${PROTOBUF_RUNTIME} - ${ZLIB_RUNTIME}) + ${ZLIB_RUNTIME} + ${Matlab_ROOT_DIR}/extern/lib/win64/microsoft/libMatlabDataArray.lib) if(WITH_OTLP_HTTP) FILE(GLOB CURL_RUNTIME ${CURL_INCLUDE_DIRS}/../bin/*.dll) From 74375f495c769283237d085ae645a72d1e426199 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 5 Dec 2023 15:28:49 -0500 Subject: [PATCH 11/21] Update Matlab install version to 2023a, and remove previous CMake file changes --- .github/workflows/build.yml | 2 ++ CMakeLists.txt | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88c6f19..f84af61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,8 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v1 + with: + release: R2023a - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab diff --git a/CMakeLists.txt b/CMakeLists.txt index 7937690..fb9dfd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,7 +318,6 @@ if(WIN32) set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${PROTOBUF_RUNTIME} ${ZLIB_RUNTIME} - ${Matlab_ROOT_DIR}/extern/lib/win64/microsoft/libMatlabDataArray.lib) if(WITH_OTLP_HTTP) FILE(GLOB CURL_RUNTIME ${CURL_INCLUDE_DIRS}/../bin/*.dll) From 7688dac1bf8b5ab4b0d4f1a34395a1a723e7c5d0 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 5 Dec 2023 15:32:55 -0500 Subject: [PATCH 12/21] Add missing paren --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb9dfd0..1b9f509 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,7 +317,7 @@ if(WIN32) FILE(GLOB ZLIB_RUNTIME ${ZLIB_INCLUDE_DIRS}/../bin/*.dll) set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${PROTOBUF_RUNTIME} - ${ZLIB_RUNTIME} + ${ZLIB_RUNTIME}) if(WITH_OTLP_HTTP) FILE(GLOB CURL_RUNTIME ${CURL_INCLUDE_DIRS}/../bin/*.dll) From 4495889b075a4bf8fbb7e0dc9f5972a7a484250c Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Thu, 21 Dec 2023 09:58:42 -0500 Subject: [PATCH 13/21] adding Macos to build.yml --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f84af61..cfddb8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,6 +52,28 @@ jobs: cmake --version cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install -v + - name: Run tests + env: + # Add the installation directory to the MATLAB Search Path by + # setting the MATLABPATH environment variable. + MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + uses: matlab-actions/run-tests@v1 + with: + select-by-folder: opentelemetry-matlab/test + build-and-run-tests-macos: + runs-on: macos-latest + steps: + - name: Download OpenTelemetry-Matlab source + uses: actions/checkout@v3 + with: + path: opentelemetry-matlab + - name: Install MATLAB + uses: matlab-actions/setup-matlab@v1 + - name: Build OpenTelemetry-Matlab + run: | + cd opentelemetry-matlab + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake --build build --config Release --target install - name: Run tests env: # Add the installation directory to the MATLAB Search Path by From ae20c902c13fbf4f15c1a62a2a3dff1d8399a29b Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Thu, 21 Dec 2023 10:19:35 -0500 Subject: [PATCH 14/21] Fix yml syntax --- .github/workflows/build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfddb8d..0d3e5c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,9 +60,12 @@ jobs: uses: matlab-actions/run-tests@v1 with: select-by-folder: opentelemetry-matlab/test - build-and-run-tests-macos: - runs-on: macos-latest - steps: + build-and-run-tests-macos: + runs-on: macos-latest + env: + OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" + SYSTEM_LIBSTDCPP_PATH: "/usr/lib/x86_64-linux-gnu/libstdc++.so.6" + steps: - name: Download OpenTelemetry-Matlab source uses: actions/checkout@v3 with: @@ -81,4 +84,4 @@ jobs: MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }} uses: matlab-actions/run-tests@v1 with: - select-by-folder: opentelemetry-matlab/test \ No newline at end of file + select-by-folder: opentelemetry-matlab/test From bfd60a6eb2018520e1c4ee3efda44499658a8e38 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Wed, 31 Jan 2024 14:57:34 -0500 Subject: [PATCH 15/21] Updated Mac Build to 23a & turn off examples --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d3e5c9..3e1f461 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,6 @@ jobs: runs-on: macos-latest env: OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" - SYSTEM_LIBSTDCPP_PATH: "/usr/lib/x86_64-linux-gnu/libstdc++.so.6" steps: - name: Download OpenTelemetry-Matlab source uses: actions/checkout@v3 @@ -72,10 +71,12 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v1 + with: + release: R2023a - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install - name: Run tests env: From d0c0a06190b68d709b9dd5caa0a58bd8eef09c5a Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 6 Feb 2024 09:05:28 -0500 Subject: [PATCH 16/21] Updating build file to remove R2023a test requirement for Windows & Mac & remove unnecesary verbose flag --- .github/workflows/build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e1f461..b641416 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,14 +44,12 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v1 - with: - release: R2023a - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab cmake --version cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} - cmake --build build --config Release --target install -v + cmake --build build --config Release --target install - name: Run tests env: # Add the installation directory to the MATLAB Search Path by @@ -71,8 +69,6 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v1 - with: - release: R2023a - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab From 3495e90dfdd91c7ea2f6ae78f6cbbe7ffea8e060 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 6 Feb 2024 10:00:35 -0500 Subject: [PATCH 17/21] Adding examples to build on Windows & Mac --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b641416..1e61f33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: run: | cd opentelemetry-matlab cmake --version - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install - name: Run tests env: @@ -72,7 +72,7 @@ jobs: - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install - name: Run tests env: From f189ce70a69ebe7b4c8b0e277d601524814982fb Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 6 Feb 2024 10:24:24 -0500 Subject: [PATCH 18/21] Updating Matlab Actions to v2 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e61f33..1de3209 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: with: path: opentelemetry-matlab - name: Install MATLAB - uses: matlab-actions/setup-matlab@v1 + uses: matlab-actions/setup-matlab@v2 - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab @@ -30,7 +30,7 @@ jobs: # Add the installation directory to the MATLAB Search Path by # setting the MATLABPATH environment variable. MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }} - uses: matlab-actions/run-tests@v1 + uses: matlab-actions/run-tests@v2 with: select-by-folder: opentelemetry-matlab/test build-and-run-tests-windows: @@ -43,7 +43,7 @@ jobs: with: path: opentelemetry-matlab - name: Install MATLAB - uses: matlab-actions/setup-matlab@v1 + uses: matlab-actions/setup-matlab@v2 - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab @@ -55,7 +55,7 @@ jobs: # Add the installation directory to the MATLAB Search Path by # setting the MATLABPATH environment variable. MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }} - uses: matlab-actions/run-tests@v1 + uses: matlab-actions/run-tests@v2 with: select-by-folder: opentelemetry-matlab/test build-and-run-tests-macos: @@ -68,7 +68,7 @@ jobs: with: path: opentelemetry-matlab - name: Install MATLAB - uses: matlab-actions/setup-matlab@v1 + uses: matlab-actions/setup-matlab@v2 - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab @@ -79,6 +79,6 @@ jobs: # Add the installation directory to the MATLAB Search Path by # setting the MATLABPATH environment variable. MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }} - uses: matlab-actions/run-tests@v1 + uses: matlab-actions/run-tests@v2 with: select-by-folder: opentelemetry-matlab/test From 9f0344f11c6eeae865387a59ce5b584f2a8e036f Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 6 Feb 2024 10:50:04 -0500 Subject: [PATCH 19/21] Adding MATLAB_Compiler to matlab install --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1de3209..cffa410 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,8 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v2 + with: + products: MATLAB_Compiler - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab @@ -44,6 +46,8 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v2 + with: + products: MATLAB_Compiler - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab @@ -69,6 +73,8 @@ jobs: path: opentelemetry-matlab - name: Install MATLAB uses: matlab-actions/setup-matlab@v2 + with: + products: MATLAB_Compiler - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab From ecd824a594dab2e5b9234d6808c86f7e263de5ea Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Tue, 6 Feb 2024 13:04:20 -0500 Subject: [PATCH 20/21] Updating context_propagation cmake to resolve build error --- examples/context_propagation/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/context_propagation/CMakeLists.txt b/examples/context_propagation/CMakeLists.txt index e1f9c6c..48693a5 100644 --- a/examples/context_propagation/CMakeLists.txt +++ b/examples/context_propagation/CMakeLists.txt @@ -20,7 +20,7 @@ set(CONTEXTPROP_EXAMPLE_DEPLOYNAME mymagic) set(CONTEXTPROP_EXAMPLE_MATLAB_SOURCE ${CMAKE_CURRENT_LIST_DIR}/matlab/${CONTEXTPROP_EXAMPLE_DEPLOYNAME}.m) set(CONTEXTPROP_EXAMPLE_ROUTES ../../../examples/context_propagation/matlab/routes.json) #somehow, only relative paths are allowed matlab_get_version_from_matlab_run(${Matlab_MAIN_PROGRAM} Matlab_LIST_VERSION) -if(DEFINED Matlab_LIST_VERSION AND ${Matlab_LIST_VERSION} VERSION_GREATER_EQUAL 23.2.0) +if(Matlab_LIST_VERSION VERSION_GREATER_EQUAL 23.2.0) # since MATLAB R2023b, route mapping can be specified at the archive level set(ARCHIVE_ROUTES ",ROUTES:${CONTEXTPROP_EXAMPLE_ROUTES}") else() From 7869efb3de9f66395efa02c3ced68e3c5e9fc8c3 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Wed, 7 Feb 2024 09:57:14 -0500 Subject: [PATCH 21/21] Removing examples build from windows --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cffa410..b47fcc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,8 +51,7 @@ jobs: - name: Build OpenTelemetry-Matlab run: | cd opentelemetry-matlab - cmake --version - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install - name: Run tests env: