diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-01 14:26:39 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-01 09:29:12 -0500 |
| commit | 5d49943504805b67a6b931feff747e47e573633e (patch) | |
| tree | 063268e46f30ecd944dd94dbab0b6bab7a86c4a0 /.gitlab | |
| parent | e60c02b2d99ae59fef3313cd3c7c1d469f971eea (diff) | |
| parent | 73d1c78bf435af11cf5245ad47530f4b4b831412 (diff) | |
| download | cmake-5d49943504805b67a6b931feff747e47e573633e.tar.gz | |
Merge topic 'ninja-regen-metadata'
73d1c78bf4 ci: update to use ninja 1.10.2
11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5555
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/ninja.ps1 | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/ninja.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/ci/ninja.ps1 b/.gitlab/ci/ninja.ps1 index 91f8b02b74..4cc6bcb6d0 100755 --- a/.gitlab/ci/ninja.ps1 +++ b/.gitlab/ci/ninja.ps1 @@ -1,7 +1,7 @@ $erroractionpreference = "stop" -$version = "1.10.0" -$sha256sum = "919FD158C16BF135E8A850BB4046EC1CE28A7439EE08B977CD0B7F6B3463D178" +$version = "1.10.2" +$sha256sum = "BBDE850D247D2737C5764C927D1071CBB1F1957DCABDA4A130FA8547C12C695F" $filename = "ninja-win" $tarball = "$filename.zip" diff --git a/.gitlab/ci/ninja.sh b/.gitlab/ci/ninja.sh index 93c1ee9573..9011bbcf5e 100755 --- a/.gitlab/ci/ninja.sh +++ b/.gitlab/ci/ninja.sh @@ -2,17 +2,17 @@ set -e -readonly version="1.10.0" +readonly version="1.10.2" case "$( uname -s )" in Linux) shatool="sha256sum" - sha256sum="6566836ddf3d72ca06685b34814e0c6fa0f0943542d651d0dab3150f10307c82" + sha256sum="763464859c7ef2ea3a0a10f4df40d2025d3bb9438fcb1228404640410c0ec22d" platform="linux" ;; Darwin) shatool="shasum -a 256" - sha256sum="2ee405c0e205d55666c60cc9c0d8d04c8ede06d3ef2e2c2aabe08fd81c17d22e" + sha256sum="6fa359f491fac7e5185273c6421a000eea6a2f0febf0ac03ac900bd4d80ed2a5" platform="mac" ;; *) |