echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Factor out scripts to add ninja to job environment

Browse Source
This commit is contained in:
Brad King 2024-04-22 18:17:28 -04:00
parent ef3495f74f
commit b0f7aebc77
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab/ci/ninja-env.sh Normal file
View File

@ -0,0 +1,3 @@
.gitlab/ci/ninja.sh
export PATH=$PWD/.gitlab:$PATH
ninja --version

4
.gitlab/os-linux.yml
View File

@ -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

4
.gitlab/os-macos.yml
View File

@ -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}