From fd3ecfd56e4244f820020b838dd9f73debeb24f7 Mon Sep 17 00:00:00 2001 From: Scott Estabrook Date: Wed, 8 Apr 2026 10:43:14 -0400 Subject: [PATCH] Reset to main, filter testWebread on macos-15-intel --- .github/workflows/build_and_test_full.yml | 1 + .github/workflows/build_and_test_simple.yml | 1 + .github/workflows/create_release.yml | 1 + test/texamples.m | 3 +++ 4 files changed, 6 insertions(+) diff --git a/.github/workflows/build_and_test_full.yml b/.github/workflows/build_and_test_full.yml index 9e83030..981c4f8 100644 --- a/.github/workflows/build_and_test_full.yml +++ b/.github/workflows/build_and_test_full.yml @@ -135,6 +135,7 @@ jobs: needs: get_version env: OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" + OPENTELEMETRY_MAC_VERSION: "${{ matrix.os }}" steps: - name: Download OpenTelemetry-Matlab source uses: actions/checkout@v3 diff --git a/.github/workflows/build_and_test_simple.yml b/.github/workflows/build_and_test_simple.yml index d7c9c78..a41039c 100644 --- a/.github/workflows/build_and_test_simple.yml +++ b/.github/workflows/build_and_test_simple.yml @@ -97,6 +97,7 @@ jobs: needs: get_version env: OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" + OPENTELEMETRY_MAC_VERSION: "${{ matrix.os }}" steps: - name: Download OpenTelemetry-Matlab source uses: actions/checkout@v3 diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 0a32791..6ebe3e1 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -185,6 +185,7 @@ jobs: os: [macos-15-intel, macos-14] # runs on Mac with both Intel (macos-15-intel) and Apple Silicon (macos-14) processors env: OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" + OPENTELEMETRY_MAC_VERSION: "${{ matrix.os }}" steps: - name: Download OpenTelemetry-Matlab source uses: actions/checkout@v3 diff --git a/test/texamples.m b/test/texamples.m index 7f4fcbc..bc2ff9c 100644 --- a/test/texamples.m +++ b/test/texamples.m @@ -256,6 +256,9 @@ function testAsyncMetrics(testCase) function testWebread(testCase) % testWebread: webread_example in examples/webread folder + % filter test on MacOS-15-Intel + macIntel = ismac && contains(getenv("OPENTELEMETRY_MAC_VERSION"),"intel"); + testCase.assumeFalse(macIntel,"Filtered test due to failures launching CppServer on macos-15-intel") % use default location to look for server, filter out if not % found serverfolder = fullfile(fileparts(mfilename('fullpath')), "..", "build", "examples", "webread");