From 6dd924563500c76b63fdb59d5b0ff3a65f45aaf2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 6 Oct 2021 13:22:32 -0400 Subject: gitlab-ci: Add cmake and ninja to PATH incrementally --- .gitlab/os-linux.yml | 3 ++- .gitlab/os-macos.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 -- cgit v0.12