From 86d33418f7510ee27f519eaaaa1b09c080ba65fc Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 10 Aug 2024 23:38:07 -0400 Subject: [PATCH] Add ninja to .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec4d4cb..7552e2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,12 +7,12 @@ setup: image: alpine:latest script: - echo "Installing dependencies..." - - apk update && apk add --no-cache curl zip unzip tar git cmake make gcc g++ bash + - apk update && apk add --no-cache curl zip unzip tar git cmake make gcc g++ bash ninja - echo "Cloning vcpkg..." - git clone https://github.com/microsoft/vcpkg.git - cd vcpkg - - ./bootstrap-vcpkg.sh - export VCPKG_FORCE_SYSTEM_BINARIES=1 + - ./bootstrap-vcpkg.sh build: stage: build @@ -21,5 +21,5 @@ build: - echo "Building the application..." - mkdir -p build - cd build - - cmake .. -DCMAKE_TOOLCHAIN_FILE=$CI_PROJECT_DIR/vcpkg/scripts/buildsystems/vcpkg.cmake - - make + - cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE=$CI_PROJECT_DIR/vcpkg/scripts/buildsystems/vcpkg.cmake + - ninja