Browse Source

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 <[email protected]>
Merge-request: !5534
Brad King 5 years ago
parent
commit
9e83e77129
2 changed files with 5 additions and 4 deletions
  1. 4 4
      .gitlab/os-macos.yml
  2. 1 0
      Tests/RunCMake/RunCMake.cmake

+ 4 - 4
.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

+ 1 - 0
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"