diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-03 13:46:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-03 13:46:18 (GMT) |
| commit | 0faf485de2911eb47128692c3cb4d76b56c05e10 (patch) | |
| tree | 0db03f84a5fae8e5d0a19f1cc314d1a1e2fa5ba2 /.gitlab/ci/docker | |
| parent | bf58164cac96c74000c46c1ca7d7d31a06137c16 (diff) | |
| parent | 62689fcf9cc6bdd1ead350d9cbcb357fe412826a (diff) | |
| download | CMake-0faf485de2911eb47128692c3cb4d76b56c05e10.zip CMake-0faf485de2911eb47128692c3cb4d76b56c05e10.tar.gz CMake-0faf485de2911eb47128692c3cb4d76b56c05e10.tar.bz2 | |
Merge topic 'ci-ninja-1.11.0'
62689fcf9c ci: update to use ninja 1.11.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7319
Diffstat (limited to '.gitlab/ci/docker')
| -rwxr-xr-x | .gitlab/ci/docker/ninja/centos7-aarch64.bash | 2 | ||||
| -rw-r--r-- | .gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/ninja/centos7-aarch64/build_ninja.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/ninja/centos7-aarch64.bash b/.gitlab/ci/docker/ninja/centos7-aarch64.bash index d24967c..4052f29 100755 --- a/.gitlab/ci/docker/ninja/centos7-aarch64.bash +++ b/.gitlab/ci/docker/ninja/centos7-aarch64.bash @@ -11,7 +11,7 @@ cleanup() { 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.10.2}" +readonly git_tag="${1-v1.11.0}" trap "cleanup" EXIT INT TERM diff --git a/.gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile b/.gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile index d9e1cc6..3fb13b0 100644 --- a/.gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile +++ b/.gitlab/ci/docker/ninja/centos7-aarch64/Dockerfile @@ -1,7 +1,7 @@ FROM kitware/cmake:build-linux-aarch64-base-2020-12-21 MAINTAINER Brad King <brad.king@kitware.com> -ARG GIT_TAG=v1.10.2 +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 index 7e2602c..91fb2d4 100755 --- a/.gitlab/ci/docker/ninja/centos7-aarch64/build_ninja.sh +++ b/.gitlab/ci/docker/ninja/centos7-aarch64/build_ninja.sh @@ -4,7 +4,7 @@ set -e git clone https://github.com/ninja-build/ninja.git cd ninja -git checkout "${1-v1.10.2}" +git checkout "${1-v1.11.0}" ./configure.py --bootstrap ./ninja all ./ninja_test |