diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-25 13:38:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-25 13:38:56 (GMT) |
| commit | 9e83e77129880885d0490d6519e30c1559c5a47c (patch) | |
| tree | f82b0cd1b72fe7d3c2a8a216254b43d51d3f5aa4 | |
| parent | 90648f205ed9fd28d6489f658b6d0c7bc920c294 (diff) | |
| parent | 5213328008f12f97a2a9d124946f1a40a3f7dc14 (diff) | |
| download | CMake-9e83e77129880885d0490d6519e30c1559c5a47c.zip CMake-9e83e77129880885d0490d6519e30c1559c5a47c.tar.gz CMake-9e83e77129880885d0490d6519e30c1559c5a47c.tar.bz2 | |
Merge topic 'ci-xcode-12.2' into release-3.19
5213328008 gitlab-ci: update macOS jobs to use Xcode 12.2
928ca50b6f Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5534
| -rw-r--r-- | .gitlab/os-macos.yml | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index db6f3bf..d9df621 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -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 diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 7d96e50..e8fbd6a 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -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" |