diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-12 13:22:29 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-15 10:24:32 -0500 |
| commit | 3d4073b129c0ee9e738b3c51c2fe6a042fd1c84c (patch) | |
| tree | c227f8b580d81fbafab1b91dd8af97dde378620b | |
| parent | bbb26645477fd7d6532d805490bae20ce8971a06 (diff) | |
| download | cmake-3d4073b129c0ee9e738b3c51c2fe6a042fd1c84c.tar.gz | |
gitlab-ci: Try upstream ninja development branch in a Windows nightly job
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/ninja-nightly.ps1 | 9 | ||||
| -rwxr-xr-x | .gitlab/ci/ninja.ps1 | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9b020b4c7..7f38659d63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -742,6 +742,8 @@ test:windows-vs2022-x64-ninja: - build:windows-vs2022-x64-ninja needs: - build:windows-vs2022-x64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY_NINJA: "true" test:windows-vs2022-x64: extends: diff --git a/.gitlab/ci/ninja-nightly.ps1 b/.gitlab/ci/ninja-nightly.ps1 new file mode 100755 index 0000000000..071b07712c --- /dev/null +++ b/.gitlab/ci/ninja-nightly.ps1 @@ -0,0 +1,9 @@ +$erroractionpreference = "stop" + +Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 +Set-Location -Path ".gitlab" +git clone https://github.com/ninja-build/ninja.git ninja-src +cmake -S ninja-src -B ninja-src/build -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release +cmake --build ninja-src/build --target ninja +Move-Item -Path "ninja-src\build\ninja.exe" -Destination . -Force +Remove-Item "ninja-src" -Recurse -Force diff --git a/.gitlab/ci/ninja.ps1 b/.gitlab/ci/ninja.ps1 index 4c5333ab73..47bb0561e5 100755 --- a/.gitlab/ci/ninja.ps1 +++ b/.gitlab/ci/ninja.ps1 @@ -1,5 +1,10 @@ $erroractionpreference = "stop" +if ("$env:CMAKE_CI_JOB_NIGHTLY_NINJA" -eq "true" -And "$env:CMAKE_CI_NIGHTLY" -eq "true") { + & .gitlab/ci/ninja-nightly.ps1 + exit $LASTEXITCODE +} + $version = "1.10.2" $sha256sum = "BBDE850D247D2737C5764C927D1071CBB1F1957DCABDA4A130FA8547C12C695F" $filename = "ninja-win" |