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 <[email protected]>
Acked-by: Ben Boeckel <[email protected]>
Merge-request: !6599

.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:

.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

.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"
 

.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
 

.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