Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Update macOS CI image to macos-11

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-07-23 16:28:50 +02:00
parent 06b1b980bb
commit f1401bc912
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/osrm-backend.yml vendored
View File

@ -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++

1
CMakeLists.txt
View File

@ -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})