diff options
| author | Brad King <brad.king@kitware.com> | 2024-07-19 14:05:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-07-19 14:05:49 (GMT) |
| commit | 39e8f67a2f87d9ca7740ed2b6fa1895f2bad30d7 (patch) | |
| tree | 2d0af1365cdb0b529b48ee33c9611b4c2508fd57 | |
| parent | cd386f6425f2558a5eb69de8a2265df52bdc5147 (diff) | |
| parent | 927300d4a01740177d4eff86676f98f3fbb37a17 (diff) | |
| download | CMake-39e8f67a2f87d9ca7740ed2b6fa1895f2bad30d7.zip CMake-39e8f67a2f87d9ca7740ed2b6fa1895f2bad30d7.tar.gz CMake-39e8f67a2f87d9ca7740ed2b6fa1895f2bad30d7.tar.bz2 | |
Merge topic 'ci-cmake-update' into release-3.30
927300d4a0 ci: Update CMake version to 3.30.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9671
| -rw-r--r-- | .gitlab/ci/cmake.ps1 | 6 | ||||
| -rwxr-xr-x | .gitlab/ci/cmake.sh | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab/ci/cmake.ps1 b/.gitlab/ci/cmake.ps1 index 89b7d1b..6fe28e4 100644 --- a/.gitlab/ci/cmake.ps1 +++ b/.gitlab/ci/cmake.ps1 @@ -1,12 +1,12 @@ $erroractionpreference = "stop" -$version = "3.30.0" +$version = "3.30.1" if ("$env:PROCESSOR_ARCHITECTURE" -eq "AMD64") { - $sha256sum = "F8D2DA0EAF3BAB9CF065E97BD6D8E1819886F8671D3D4C7BB93CB774123FA448" + $sha256sum = "CF7788FF9D92812DA194847D4EC874FC576F34079987D0F20C96CD09E2A16220" $platform = "windows-x86_64" } elseif ("$env:PROCESSOR_ARCHITECTURE" -eq "ARM64") { - $sha256sum = "CB8FB65A8F523DAA0CE6C531407AE10FCAB8D0EEFE18A6EF9FB718C54307D6E3" + $sha256sum = "02B433F70AA549449BE2D53046D0179590BF3B6290D9FDA3FBBB23F96A4F2802" $platform = "windows-arm64" } else { throw ('unknown PROCESSOR_ARCHITECTURE: ' + "$env:PROCESSOR_ARCHITECTURE") diff --git a/.gitlab/ci/cmake.sh b/.gitlab/ci/cmake.sh index 477c1193..3244e6d 100755 --- a/.gitlab/ci/cmake.sh +++ b/.gitlab/ci/cmake.sh @@ -2,22 +2,22 @@ set -e -readonly version="3.30.0" +readonly version="3.30.1" case "$(uname -s)-$(uname -m)" in Linux-x86_64) shatool="sha256sum" - sha256sum="09846a3858583f38189b59177586adf125a08c15f3cddcaf7d7d7081ac86969f" + sha256sum="ac31f077ef3378641fa25a3cb980d21b2f083982d3149a8f2eb9154f2b53696b" platform="linux-x86_64" ;; Linux-aarch64) shatool="sha256sum" - sha256sum="3db7f12dadc91be9b30f0e5a71038c51d7f5b7cc03e32625621a052e9996bef0" + sha256sum="ad234996f8750f11d7bd0d17b03f55c434816adf1f1671aab9e8bab21a43286a" platform="linux-aarch64" ;; Darwin-*) shatool="shasum -a 256" - sha256sum="5fd0550f6a1ce1b88276a6d828483e8ddbf5e14053b32a0e534e95294ba3a2e3" + sha256sum="51e12618829b811bba6f033ee8f39f6192da1b6abb20d82a7899d5134e879a4c" platform="macos-universal" ;; *) |