From 26701689c2cf837e321684401827859a3e81f3c2 Mon Sep 17 00:00:00 2001 From: duncanpo Date: Tue, 2 Dec 2025 10:58:38 -0500 Subject: [PATCH 1/2] clean up for installing grpc runtime --- CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab78b3a..ba1eac2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -682,11 +682,11 @@ install(FILES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES} DESTINATION ${DEPENDENT_R if(UNIX) if(WITH_OTLP_GRPC) # Uniform version numbers for most files - set(FULL_VERSION "41.0.0") - set(SHORT_VERSION "41") + set(GRPC_FULL_VERSION "41.0.0") + set(GRPC_SHORT_VERSION "41") # Loop through all base names (no version numbers here) - foreach(base IN ITEMS + foreach(grpcfile IN ITEMS libaddress_sorting libgpr libgrpc @@ -698,13 +698,18 @@ if(UNIX) libupb_textformat_lib libutf8_range_lib ) - install_and_shorten_version(${base} ${FULL_VERSION} ${SHORT_VERSION}) + install_and_shorten_version(${grpcfile} ${GRPC_FULL_VERSION} ${GRPC_SHORT_VERSION}) endforeach() # Handle libgrpc++ separately (different version scheme) set(GRPCPP_FULL_VERSION "1.64.2") set(GRPCPP_SHORT_VERSION "1.64") - install_and_shorten_version(libgrpc++ ${GRPCPP_FULL_VERSION} ${GRPCPP_SHORT_VERSION}) + foreach(grpcppfile IN ITEMS + libgrpc++ + libgrpc++_unsecure + ) + install_and_shorten_version(${grpcppfile} ${GRPCPP_FULL_VERSION} ${GRPCPP_SHORT_VERSION}) + endforeach() endif() # Move any shared libraries to platform specific directories, so that they won't overwrite each other From ff1ba1f61087fb90c2ace005fe33089b1bb4c3c4 Mon Sep 17 00:00:00 2001 From: duncanpo Date: Mon, 8 Dec 2025 17:41:30 -0500 Subject: [PATCH 2/2] Move from macos-13 to macos-15-intel following deprecation --- .github/workflows/build_and_test_full.yml | 2 +- .github/workflows/build_and_test_simple.yml | 2 +- .github/workflows/create_release.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_and_test_full.yml b/.github/workflows/build_and_test_full.yml index a2918d6..74e04c5 100644 --- a/.github/workflows/build_and_test_full.yml +++ b/.github/workflows/build_and_test_full.yml @@ -130,7 +130,7 @@ jobs: 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 + os: [macos-15-intel, macos-14] # runs on Mac with both Intel (macos-15-intel) and Apple Silicon (macos-14) processors needs: get_version env: OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" diff --git a/.github/workflows/build_and_test_simple.yml b/.github/workflows/build_and_test_simple.yml index d703e44..d7c9c78 100644 --- a/.github/workflows/build_and_test_simple.yml +++ b/.github/workflows/build_and_test_simple.yml @@ -93,7 +93,7 @@ jobs: 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 + os: [macos-15-intel, macos-14] # runs on Mac with both Intel (macos-15-intel) and Apple Silicon (macos-14) processors needs: get_version env: OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install" diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 70dfe85..0a32791 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -78,7 +78,7 @@ jobs: 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 + 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" steps: @@ -182,7 +182,7 @@ jobs: 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 + 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" steps: @@ -243,7 +243,7 @@ jobs: mv ../artifacts-downloaded/*/otel-matlab-macos*.tar.gz . mv ../artifacts-downloaded/*/otel-matlab-windows.tar.gz . tar -xzvf otel-matlab-ubuntu.tar.gz - tar -xzvf otel-matlab-macos-13.tar.gz + tar -xzvf otel-matlab-macos-15-intel.tar.gz tar -xzvf otel-matlab-macos-14.tar.gz tar -xzvf otel-matlab-windows.tar.gz - name: Decompress Artifacts without gRPC exporter @@ -252,7 +252,7 @@ jobs: cd $NOGRPC_FOLDER mv ../artifacts-downloaded/*/*nogrpc*.tar.gz . tar -xzvf otel-matlab-nogrpc-ubuntu.tar.gz - tar -xzvf otel-matlab-nogrpc-macos-13.tar.gz + tar -xzvf otel-matlab-nogrpc-macos-15-intel.tar.gz tar -xzvf otel-matlab-nogrpc-macos-14.tar.gz tar -xzvf otel-matlab-nogrpc-windows.tar.gz - name: Install MATLAB