diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-26 11:12:02 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-04-26 11:12:02 -0400 |
| commit | adcb98c51b0d09c6300c0a4b600e5085f8e1d17b (patch) | |
| tree | 203133d13c8984802fea6c9314e4f6a0e5576f19 | |
| parent | 024204fe0daef9b17e22d02f6fb3d465dac912b6 (diff) | |
| parent | 65b6daf776713b7fd701c4aadaa89e102c048879 (diff) | |
| download | cmake-adcb98c51b0d09c6300c0a4b600e5085f8e1d17b.tar.gz | |
Merge branch 'ci-xcode-13.3' into release-3.21
Merge-request: !7204
| -rw-r--r-- | .gitlab/os-macos.yml | 12 | ||||
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 9eca6f8402..6de277dc6f 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-13.2.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-13.3.app/Contents/Developer" # Avoid conflicting with other projects running on the same machine. SCCACHE_SERVER_PORT: 4227 @@ -87,7 +87,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.2 + - xcode-13.3 - nonconcurrent .macos_x86_64_builder_tags_package: @@ -95,7 +95,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.2 + - xcode-13.3 - nonconcurrent - finder @@ -104,7 +104,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-13.2 + - xcode-13.3 - concurrent .macos_arm64_builder_tags: @@ -112,7 +112,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.2 + - xcode-13.3 - nonconcurrent .macos_arm64_builder_ext_tags: @@ -120,7 +120,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos-arm64 - shell - - xcode-13.2 + - xcode-13.3 - concurrent ## macOS-specific scripts diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 3363a579e0..02e0decbb2 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -156,8 +156,9 @@ function(run_cmake test) "|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:" "|[^\n]*xcodebuild[^\n]*DVTPlugInManager" + "|[^\n]*xcodebuild[^\n]*Requested but did not find extension point with identifier" "|[^\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]*objc[^\n]*: Class [^\n]* One of the two will be used. Which one is undefined." "|[^\n]*is a member of multiple groups" "|[^\n]*offset in archive not a multiple of 8" "|[^\n]*from Time Machine by path" |