Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update macOS CI image to macos-11 #6286

Merged
merged 2 commits into from
Jul 30, 2022
+6 −5
Merged

Update macOS CI image to macos-11 #6286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1401bc
Update macOS CI image to macos-11
SiarheiFedartsou Jul 23, 2022
c9ce7fc
Update macOS CI image to macos-11
SiarheiFedartsou Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/osrm-backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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++
Expand Down Expand Up @@ -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++
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ endif()

# Configuring other platform dependencies
if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Due to this we see warnings when building on newer versions of macOS:
Screenshot 2022-07-23 at 16 32 41

I don't see any reason to have it tbh.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, this was added by the reason #3198

Not sure it is still relevant, but removing this change for the time being.

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})
Expand Down