diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-22 22:17:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-04-22 22:17:28 (GMT) |
| commit | b0f7aebc774a7d83fb197fc3431e99f2e8215480 (patch) | |
| tree | 70047df0052fe9c6db4681cc063495fb38e77f05 /.gitlab | |
| parent | ef3495f74f9c35684a2596c1019b08f1787a0376 (diff) | |
| download | CMake-b0f7aebc774a7d83fb197fc3431e99f2e8215480.zip CMake-b0f7aebc774a7d83fb197fc3431e99f2e8215480.tar.gz CMake-b0f7aebc774a7d83fb197fc3431e99f2e8215480.tar.bz2 | |
ci: Factor out scripts to add ninja to job environment
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/ninja-env.sh | 3 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 4 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab/ci/ninja-env.sh b/.gitlab/ci/ninja-env.sh new file mode 100644 index 0000000..744b9f3 --- /dev/null +++ b/.gitlab/ci/ninja-env.sh @@ -0,0 +1,3 @@ +.gitlab/ci/ninja.sh +export PATH=$PWD/.gitlab:$PATH +ninja --version diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 11b4780..274b62e 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -512,9 +512,7 @@ .before_script_linux: &before_script_linux - source .gitlab/ci/env.sh - source .gitlab/ci/cmake-env.sh - - .gitlab/ci/ninja.sh - - export PATH=$PWD/.gitlab:$PATH - - ninja --version + - source .gitlab/ci/ninja-env.sh .cmake_prep_source_linux: stage: prep diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 5d148e0..894d624 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -176,9 +176,7 @@ .before_script_macos: &before_script_macos - source .gitlab/ci/env.sh - source .gitlab/ci/cmake-env.sh - - .gitlab/ci/ninja.sh - - export PATH=$PWD/.gitlab:$PATH - - ninja --version + - source .gitlab/ci/ninja-env.sh # Download Qt - cmake -P .gitlab/ci/download_qt.cmake - export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH} |