diff --git a/.gitlab/ci/docker/ninja/centos7-aarch64.bash b/.gitlab/ci/docker/ninja/centos7-aarch64.bash deleted file mode 100755 index 4052f29a42..0000000000 --- a/.gitlab/ci/docker/ninja/centos7-aarch64.bash +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -x - -cleanup() { - docker container rm -fv "$build_container" >/dev/null 2>&1 || true - docker image rm -f "$build_image" >/dev/null 2>&1 || true -} - -readonly suffix="-$(date -u +%Y-%m-%d)-${RANDOM}" -readonly build_container="ninja-build-linux-aarch64$suffix" -readonly build_image="ninja:build-linux-aarch64$suffix" -readonly git_tag="${1-v1.11.0}" - -trap "cleanup" EXIT INT TERM - -docker image build --build-arg GIT_TAG="$git_tag" --tag="$build_image" "${BASH_SOURCE%/*}/centos7-aarch64" -docker container create --name "$build_container" "$build_image" -docker cp "$build_container:/ninja/ninja" "ninja" diff --git a/.gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile b/.gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile deleted file mode 100644 index 3fb13b0455..0000000000 --- a/.gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM kitware/cmake:build-linux-aarch64-base-2020-12-21 -MAINTAINER Brad King - -ARG GIT_TAG=v1.11.0 - -COPY build_ninja.sh /root/build_ninja.sh -RUN scl enable devtoolset-7 -- sh /root/build_ninja.sh $GIT_TAG diff --git a/.gitlab/ci/docker/ninja/centos7-aarch64/build_ninja.sh b/.gitlab/ci/docker/ninja/centos7-aarch64/build_ninja.sh deleted file mode 100755 index 91fb2d4896..0000000000 --- a/.gitlab/ci/docker/ninja/centos7-aarch64/build_ninja.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -git clone https://github.com/ninja-build/ninja.git -cd ninja -git checkout "${1-v1.11.0}" -./configure.py --bootstrap -./ninja all -./ninja_test -strip ninja diff --git a/.gitlab/ci/ninja.ps1 b/.gitlab/ci/ninja.ps1 index 4c4d675190..81d3f2e513 100644 --- a/.gitlab/ci/ninja.ps1 +++ b/.gitlab/ci/ninja.ps1 @@ -5,9 +5,18 @@ if ("$env:CMAKE_CI_JOB_NIGHTLY_NINJA" -eq "true" -And "$env:CMAKE_CI_NIGHTLY" -e exit $LASTEXITCODE } -$version = "1.11.0" -$sha256sum = "D0EE3DA143211AA447E750085876C9B9D7BCDD637AB5B2C5B41349C617F22F3B" -$filename = "ninja-win" +$version = "1.12.1" + +if ("$env:PROCESSOR_ARCHITECTURE" -eq "AMD64") { + $sha256sum = "F550FEC705B6D6FF58F2DB3C374C2277A37691678D6ABA463ADCBB129108467A" + $filename = "ninja-win" +} elseif ("$env:PROCESSOR_ARCHITECTURE" -eq "ARM64") { + $sha256sum = "79C96A50E0DEAFEC212CFA85AA57C6B74003F52D9D1673DDCD1EAB1C958C5900" + $filename = "ninja-winarm64" +} else { + throw ('unknown PROCESSOR_ARCHITECTURE: ' + "$env:PROCESSOR_ARCHITECTURE") +} + $tarball = "$filename.zip" $outdir = $pwd.Path diff --git a/.gitlab/ci/ninja.sh b/.gitlab/ci/ninja.sh index 753596b86d..530feac1ea 100755 --- a/.gitlab/ci/ninja.sh +++ b/.gitlab/ci/ninja.sh @@ -6,25 +6,23 @@ if test "$CMAKE_CI_JOB_NIGHTLY_NINJA" = "true" -a "$CMAKE_CI_NIGHTLY" = "true"; exec .gitlab/ci/ninja-nightly.sh fi -readonly version="1.11.0" +readonly version="1.12.1" baseurl="https://github.com/ninja-build/ninja/releases/download/v$version" case "$(uname -s)-$(uname -m)" in Linux-x86_64) shatool="sha256sum" - sha256sum="9726e730d5b8599f82654dc80265e64a10a8a817552c34153361ed0c017f9f02" + sha256sum="6f98805688d19672bd699fbbfa2c2cf0fc054ac3df1f0e6a47664d963d530255" filename="ninja-linux" ;; Linux-aarch64) shatool="sha256sum" - sha256sum="b002eb77cfcef6d329cccf8b1cc7ad138302d6e19b5b76b10b4c4d38564b47b5" - # Use binary built by adjacent 'docker/ninja/centos7-aarch64.bash' script. - baseurl="https://cmake.org/files/dependencies" - filename="ninja-$version-1-linux-aarch64" + sha256sum="5c25c6570b0155e95fce5918cb95f1ad9870df5768653afe128db822301a05a1" + filename="ninja-linux-aarch64" ;; Darwin-*) shatool="shasum -a 256" - sha256sum="21915277db59756bfc61f6f281c1f5e3897760b63776fd3d360f77dd7364137f" + sha256sum="89a287444b5b3e98f88a945afa50ce937b8ffd1dcc59c555ad9b1baf855298c9" filename="ninja-mac" ;; *)