diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-15 13:32:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-15 13:32:45 (GMT) |
| commit | 81104d7ce8db8b07ebc26b0789cde4b20f48d720 (patch) | |
| tree | 18c768b80b1acc43e1ce7ec988ebe0edd8372cb5 | |
| parent | 3b4bd019ffb088bbf34fbdbc7512a086d652c7d4 (diff) | |
| parent | 24099112c07d65ac4978cd8250fe03caa2f51f1d (diff) | |
| download | CMake-81104d7ce8db8b07ebc26b0789cde4b20f48d720.zip CMake-81104d7ce8db8b07ebc26b0789cde4b20f48d720.tar.gz CMake-81104d7ce8db8b07ebc26b0789cde4b20f48d720.tar.bz2 | |
Merge topic 'ci-rel-win-arm64-nightly' into release-3.24
24099112c0 gitlab-ci: Add jobs to package and upload Windows arm64 nightly binaries
dfa5401af6 ci: use CMake 3.24.0-rc1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7368
| -rw-r--r-- | .gitlab-ci.yml | 23 | ||||
| -rwxr-xr-x | .gitlab/ci/cmake.ps1 | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/cmake.sh | 8 |
3 files changed, 29 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc05626..8f26508 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1114,3 +1114,26 @@ b:windows-arm64-package: - p:doc-package variables: CMAKE_CI_ARTIFACTS_NAME: "artifacts-windows-arm64-build" + +k:windows-arm64-package: + extends: + - .windows_arm64_package + - .cmake_package_windows + - .cmake_release_artifacts + - .windows_tags_nonconcurrent_vs2022_arm64 + - .run_only_for_package + dependencies: + - b:windows-arm64-package + needs: + - b:windows-arm64-package + variables: + CMAKE_CI_ARTIFACTS_NAME: "artifacts-windows-arm64" + +u:windows-arm64-package: + extends: + - .rsync_upload_package + - .run_only_for_package + dependencies: + - k:windows-arm64-package + needs: + - k:windows-arm64-package diff --git a/.gitlab/ci/cmake.ps1 b/.gitlab/ci/cmake.ps1 index fd8e29f..bea3286 100755 --- a/.gitlab/ci/cmake.ps1 +++ b/.gitlab/ci/cmake.ps1 @@ -1,7 +1,7 @@ $erroractionpreference = "stop" -$version = "3.23.1" -$sha256sum = "9B509CC4EB7191DC128CFA3F2170036F9CBC7D9D5F93FF7FAFC5B2D77B3B40DC" +$version = "3.24.0-rc1" +$sha256sum = "8D075F5C663263713008FB77E31956C808D3A30074C3655F16EB76A0800F99D6" $filename = "cmake-$version-windows-x86_64" $tarball = "$filename.zip" diff --git a/.gitlab/ci/cmake.sh b/.gitlab/ci/cmake.sh index 7d964ee..0d52e19 100755 --- a/.gitlab/ci/cmake.sh +++ b/.gitlab/ci/cmake.sh @@ -2,22 +2,22 @@ set -e -readonly version="3.23.1" +readonly version="3.24.0-rc1" case "$(uname -s)-$(uname -m)" in Linux-x86_64) shatool="sha256sum" - sha256sum="f3c654b2e226b9d43369e0bd8487c51618d4dbe5a1af929dd32af7e6ca432d60" + sha256sum="183ff011a2177d0a683e81d645d02c0ed8ff790449158522928ef069775091cc" platform="linux-x86_64" ;; Linux-aarch64) shatool="sha256sum" - sha256sum="74062efddeb935bce3d33694a4db534cef9a650f77a9a153a9f217d9dc385c75" + sha256sum="f26642d5bc503de6bf7dd2d06afb8777d5862aa44e556cdf4155fec60e534d04" platform="linux-aarch64" ;; Darwin-*) shatool="shasum -a 256" - sha256sum="f794ed92ccb4e9b6619a77328f313497d7decf8fb7e047ba35a348b838e0e1e2" + sha256sum="417fde30f2cf96f53eaf27b1e510924ce441f0449e53974f2156cb19d32978b9" platform="macos-universal" ;; *) |