diff --git a/.github/workflows/mac_upb_debug.yml b/.github/workflows/mac_upb_debug.yml new file mode 100644 index 0000000..385aaf5 --- /dev/null +++ b/.github/workflows/mac_upb_debug.yml @@ -0,0 +1,50 @@ +name: "Debug Mac upb build failure" +on: + workflow_dispatch: + push: + branches: + - mac_upb +env: + MLM_LICENSE_TOKEN: ${{ secrets.MLM_LICENSE_TOKEN }} +jobs: + build-and-run-tests-macos: + runs-on: macos-14 + env: + OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" + steps: + - name: Download OpenTelemetry-Matlab source + uses: actions/checkout@v3 + with: + path: opentelemetry-matlab + - name: Install ninja-build + run: brew install ninja + - name: Install MATLAB + uses: matlab-actions/setup-matlab@v2 + with: + release: R2025a + products: MATLAB_Compiler MATLAB_Compiler_SDK + - name: Build OpenTelemetry-Matlab + working-directory: opentelemetry-matlab + env: + CMAKE_POLICY_VERSION_MINIMUM: 3.5 + run: | + cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=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 + # setting the MATLABPATH environment variable. + MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }} + uses: matlab-actions/run-tests@v2 + with: + select-by-folder: opentelemetry-matlab/test + - name: Compress test results into single artifact + if: always() + working-directory: ${{ github.workspace }} + run: tar -czf upb_failure_logs.tar.gz /Users/runner/work/OpenTelemetry-MATLAB/OpenTelemetry-MATLAB/opentelemetry-matlab/build/_deps/vcpkg-src/buildtrees/openssl/ + - name: Upload artifacts + if: always() + uses: actions/upload-artifact@v4 + with: + name: upb_failure_logs.tar.gz + path: ${{ github.workspace }}/upb_failure_logs.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index e02c2c9..04b78cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ else() set(VCPKG_FETCH_CONTENT_NAME vcpkg) set(VCPKG_GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git") - set(VCPKG_GIT_TAG "b02e341") + set(VCPKG_GIT_TAG "ce613c4") FetchContent_Declare( ${VCPKG_FETCH_CONTENT_NAME} GIT_REPOSITORY ${VCPKG_GIT_REPOSITORY} diff --git a/vcpkg.json b/vcpkg.json index a295500..95e04f2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -20,7 +20,10 @@ "abseil", "c-ares", "re2", - "openssl", + { + "name": "openssl", + "version>=": "3.5.0" + }, "upb" ] }