Commit 9e83e771 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'ci-xcode-12.2' into release-3.19

52133280 gitlab-ci: update macOS jobs to use Xcode 12.2
928ca50b

 Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5534
parents 90648f20 52133280
Pipeline #202590 failed with stages
in 56 minutes and 18 seconds
......@@ -7,7 +7,7 @@
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID"
# TODO: Factor this out so that each job selects the Xcode version to
# use so that different versions can be tested in a single pipeline.
DEVELOPER_DIR: "/Applications/Xcode-12.0.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode-12.2.app/Contents/Developer"
# Avoid conflicting with other projects running on the same machine.
SCCACHE_SERVER_PORT: 4227
......@@ -63,7 +63,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- xcode-12.0
- xcode-12.2
- nonconcurrent
.macos_builder_tags_package:
......@@ -71,7 +71,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- xcode-12.0
- xcode-12.2
- nonconcurrent
- finder
......@@ -80,7 +80,7 @@
- cmake # Since this is a bare runner, pin to a project.
- macos
- shell
- xcode-12.0
- xcode-12.2
- concurrent
## macOS-specific scripts
......
......@@ -152,6 +152,7 @@ function(run_cmake test)
"|Please obtain a new version at"
"|contact PGI Sales at"
"|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:"
"|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type"
"|[^\n]*objc[^\n]*: Class AMSupportURL[^\n]* One of the two will be used. Which one is undefined."
"|[^\n]*is a member of multiple groups"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment