From f1401bc912d1d98632752761452f8811a0f03da4 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 23 Jul 2022 16:28:50 +0200 Subject: [PATCH 1/2] Update macOS CI image to macos-11 --- .github/workflows/osrm-backend.yml | 10 +++++----- CMakeLists.txt | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 5bdac011bf1..d80517f3e67 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -177,7 +177,7 @@ jobs: build_node_package: true continue-on-error: false node: 12 - runs-on: macos-10.15 + runs-on: macos-11 BUILD_TOOLS: ON BUILD_TYPE: Release CCOMPILER: clang @@ -190,7 +190,7 @@ jobs: build_node_package: true continue-on-error: false node: 14 - runs-on: macos-10.15 + runs-on: macos-11 BUILD_TOOLS: ON BUILD_TYPE: Release CCOMPILER: clang @@ -203,7 +203,7 @@ jobs: build_node_package: true continue-on-error: false node: 16 - runs-on: macos-10.15 + runs-on: macos-11 BUILD_TOOLS: ON BUILD_TYPE: Release CCOMPILER: clang @@ -294,7 +294,7 @@ jobs: continue-on-error: true # TODO: Use node 'latest' once supported: https://github.com/actions/setup-node/issues/257 node: 16 - runs-on: macos-10.15 + runs-on: macos-11 BUILD_TYPE: Release CCOMPILER: clang CXXCOMPILER: clang++ @@ -330,7 +330,7 @@ jobs: build_node_package: true continue-on-error: true node: "lts/*" - runs-on: macos-10.15 + runs-on: macos-11 BUILD_TYPE: Release CCOMPILER: clang CXXCOMPILER: clang++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 48f5ecdb5af..c0d87b5e038 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -419,7 +419,6 @@ endif() # Configuring other platform dependencies if(APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10") execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE) exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) From c9ce7fc778cd0691e7c23b4c431e69bf870217f0 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 23 Jul 2022 16:35:59 +0200 Subject: [PATCH 2/2] Update macOS CI image to macos-11 --- CHANGELOG.md | 1 + CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 060e2c77f95..71ca253f691 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - API: - FIXED: Fix inefficient osrm-routed connection handling [#6113](https://github.com/Project-OSRM/osrm-backend/pull/6113) - Build: + - CHANGED: Update macOS CI image to macos-11. [#6286](https://github.com/Project-OSRM/osrm-backend/pull/6286) - CHANGED: Enable even more clang-tidy checks. [#6273](https://github.com/Project-OSRM/osrm-backend/pull/6273) - CHANGED: Configure CMake to not build flatbuffers tests and samples. [#6274](https://github.com/Project-OSRM/osrm-backend/pull/6274) - CHANGED: Enable more clang-tidy checks. [#6270](https://github.com/Project-OSRM/osrm-backend/pull/6270) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0d87b5e038..48f5ecdb5af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -419,6 +419,7 @@ endif() # Configuring other platform dependencies if(APPLE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10") execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE) exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})