From 010dbc0e7aa9e12bb62712b5f3ed82fc7e6f9dcd Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Mon, 19 Aug 2024 19:28:49 +0000 Subject: [PATCH 1/2] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0d7a7e..1b71620 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ build: stage: build script: # Set the VCPKG_TOOLCHAIN environment variable - - vcpkg install freeimage + - ls /vcpkg - export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake - mkdir -p build - cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN @@ -27,7 +27,6 @@ run_tests: dependencies: - build script: - - vcpkg install freeimage - apt-get update && apt-get install -y xvfb - Xvfb :99 -screen 0 1024x768x24 & - sleep 5 From abea7884b74aa79682aac97e81449be0bee37395 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Mon, 19 Aug 2024 19:29:53 +0000 Subject: [PATCH 2/2] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b71620..976b7e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,9 @@ build: stage: build script: # Set the VCPKG_TOOLCHAIN environment variable - - ls /vcpkg + - ls /vcpkg/installed + - ls /vcpkg/installed/x64-linux + - ls /vcpkg/installed/x64-linux/lib - export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake - mkdir -p build - cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN