diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-07 13:18:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-07 13:19:07 (GMT) |
| commit | 523039ce12a56c0fe3bed184d3bb0533af7b5334 (patch) | |
| tree | f8ac637538d4a417dd55ba9d6ce246fcf7010315 | |
| parent | f175a62fcc08678da5c0c567a196ebdca9e0b1a5 (diff) | |
| parent | b5a59251cbd3cfdc00ffeb6d6d64af12a540c702 (diff) | |
| download | CMake-523039ce12a56c0fe3bed184d3bb0533af7b5334.zip CMake-523039ce12a56c0fe3bed184d3bb0533af7b5334.tar.gz CMake-523039ce12a56c0fe3bed184d3bb0533af7b5334.tar.bz2 | |
Merge topic 'ci-nightly-ninja'
b5a59251cb gitlab-ci: Try upstream ninja development branch in some nightly jobs
6dd9245635 gitlab-ci: Add cmake and ninja to PATH incrementally
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6599
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/ninja-nightly.sh | 11 | ||||
| -rwxr-xr-x | .gitlab/ci/ninja.sh | 4 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 3 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 3 |
5 files changed, 23 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a964b46..68f690d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -166,6 +166,8 @@ test:debian10-ninja: - .cmake_junit_artifacts - .run_dependent - .needs_centos6_x86_64 + variables: + CMAKE_CI_JOB_NIGHTLY_NINJA: "true" test:debian10-aarch64-ninja: extends: @@ -611,6 +613,8 @@ test:macos-x86_64-ninja: - build:macos-x86_64-ninja needs: - build:macos-x86_64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY_NINJA: "true" test:macos-arm64-ninja: extends: diff --git a/.gitlab/ci/ninja-nightly.sh b/.gitlab/ci/ninja-nightly.sh new file mode 100755 index 0000000..b78b64e --- /dev/null +++ b/.gitlab/ci/ninja-nightly.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +cd .gitlab + +git clone https://github.com/ninja-build/ninja.git ninja-src +cmake -S ninja-src -B ninja-src/build -DCMAKE_BUILD_TYPE=Release +cmake --build ninja-src/build --parallel --target ninja +mv ninja-src/build/ninja . +rm -rf ninja-src diff --git a/.gitlab/ci/ninja.sh b/.gitlab/ci/ninja.sh index 8ead670..866d1d5 100755 --- a/.gitlab/ci/ninja.sh +++ b/.gitlab/ci/ninja.sh @@ -2,6 +2,10 @@ set -e +if test "$CMAKE_CI_JOB_NIGHTLY_NINJA" = "true" -a "$CMAKE_CI_NIGHTLY" = "true"; then + exec .gitlab/ci/ninja-nightly.sh +fi + readonly version="1.10.2" baseurl="https://github.com/ninja-build/ninja/releases/download/v$version" diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index de370db..7fce177 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -321,8 +321,9 @@ .before_script_linux: &before_script_linux - source .gitlab/ci/env.sh - .gitlab/ci/cmake.sh + - export PATH=$PWD/.gitlab/cmake/bin:$PATH - .gitlab/ci/ninja.sh - - export PATH=$PWD/.gitlab:$PWD/.gitlab/cmake/bin:$PATH + - export PATH=$PWD/.gitlab:$PATH - cmake --version - ninja --version diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index b79d46d..3ffd9d7 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -127,8 +127,9 @@ .before_script_macos: &before_script_macos - .gitlab/ci/cmake.sh + - export PATH=$PWD/.gitlab/cmake/bin:$PATH - .gitlab/ci/ninja.sh - - export PATH=$PWD/.gitlab:$PWD/.gitlab/cmake/bin:$PATH + - export PATH=$PWD/.gitlab:$PATH - cmake --version - ninja --version # Download Qt |