Merge branch 'main' of https://git.jackmchristensen.com/jack/terravisor
This commit is contained in:
commit
0e7051e083
|
@ -12,7 +12,9 @@ build:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
# Set the VCPKG_TOOLCHAIN environment variable
|
# Set the VCPKG_TOOLCHAIN environment variable
|
||||||
- vcpkg install freeimage
|
- ls /vcpkg/installed
|
||||||
|
- ls /vcpkg/installed/x64-linux
|
||||||
|
- ls /vcpkg/installed/x64-linux/lib
|
||||||
- export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
|
- export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
|
||||||
- mkdir -p build
|
- mkdir -p build
|
||||||
- cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN
|
- cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN
|
||||||
|
@ -27,7 +29,6 @@ run_tests:
|
||||||
dependencies:
|
dependencies:
|
||||||
- build
|
- build
|
||||||
script:
|
script:
|
||||||
- vcpkg install freeimage
|
|
||||||
- apt-get update && apt-get install -y xvfb
|
- apt-get update && apt-get install -y xvfb
|
||||||
- Xvfb :99 -screen 0 1024x768x24 &
|
- Xvfb :99 -screen 0 1024x768x24 &
|
||||||
- sleep 5
|
- sleep 5
|
||||||
|
|
Loading…
Reference in New Issue