diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-18 18:35:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-18 18:36:01 (GMT) |
| commit | f5f7bf122f0b5a26d863a88e4baa9fee1a6ca71c (patch) | |
| tree | 27119fccab98b8f25e612a3f6cdd454c4f5175f6 /.gitlab | |
| parent | 6d098535a5d90f62a6448daec9a983318abe1354 (diff) | |
| parent | ec5223666b9b8dc06fccf3d39bc79b163a5de867 (diff) | |
| download | CMake-f5f7bf122f0b5a26d863a88e4baa9fee1a6ca71c.zip CMake-f5f7bf122f0b5a26d863a88e4baa9fee1a6ca71c.tar.gz CMake-f5f7bf122f0b5a26d863a88e4baa9fee1a6ca71c.tar.bz2 | |
Merge topic 'ci-updates'
ec5223666b gitlab-ci: update macOS jobs to use Xcode 12.0
fa0c02e9df ci: update to use CMake 3.19.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5516
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/cmake.ps1 | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/cmake.sh | 6 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab/ci/cmake.ps1 b/.gitlab/ci/cmake.ps1 index e73aab7..9d7f317 100755 --- a/.gitlab/ci/cmake.ps1 +++ b/.gitlab/ci/cmake.ps1 @@ -1,7 +1,7 @@ $erroractionpreference = "stop" -$version = "3.18.4" -$sha256sum = "A932BC0C8EE79F1003204466C525B38A840424D4AE29F9E5FB88959116F2407D" +$version = "3.19.0" +$sha256sum = "67BBDA67C98C5F0789199FE1DB650F12274A6AD40FD8CAE88D208029AC618905" $filename = "cmake-$version-win64-x64" $tarball = "$filename.zip" diff --git a/.gitlab/ci/cmake.sh b/.gitlab/ci/cmake.sh index b4c6ddf..2547663 100755 --- a/.gitlab/ci/cmake.sh +++ b/.gitlab/ci/cmake.sh @@ -2,17 +2,17 @@ set -e -readonly version="3.18.4" +readonly version="3.19.0" case "$( uname -s )" in Linux) shatool="sha256sum" - sha256sum="149e0cee002e59e0bb84543cf3cb099f108c08390392605e944daeb6594cbc29" + sha256sum="5446cdee900e906e46162a5a7be9b4542bb5e886041cf8cffeda62aae2696ccf" platform="Linux" ;; Darwin) shatool="shasum -a 256" - sha256sum="9d27049660474cf134ab46fa0e0db771b263313fcb8ba82ee8b2d1a1a62f8f20" + sha256sum="315eb5500753f797075b6ea43189420e97b0b9f32c8fc87ec94ba1d80b72eb7f" platform="Darwin" ;; *) diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index a500d36..db6f3bf 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-11.7.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode-12.0.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-11.7 + - xcode-12.0 - nonconcurrent .macos_builder_tags_package: @@ -71,7 +71,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-11.7 + - xcode-12.0 - nonconcurrent - finder @@ -80,7 +80,7 @@ - cmake # Since this is a bare runner, pin to a project. - macos - shell - - xcode-11.7 + - xcode-12.0 - concurrent ## macOS-specific scripts |