From 2b0bd5b6c14cd32c58e9e86dd3a36f38db6a40e2 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Mon, 26 Nov 2018 15:12:50 +0100
Subject: [PATCH] Update CI/CD
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a102f2..50ef104 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,8 @@ build windows:
- New-Item -ItemType Directory -Force 'dependencies'
- $name='BT_Interfaces'; Move-Item -Force "$name-*" dependencies/$name
- $env:CMAKE_PREFIX_PATH="$((Get-Item -Path '.').FullName)/dependencies;$env:VCPKG_INSTALL_DIR"
- - C:/VsDevEnv.ps1 -arch=amd64
+ - . /Library.ps1
+ - VSDevEnv -arch=amd64 -vcvars_ver="14.15"
script:
- cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_PREFIX_PATH="$env:CMAKE_PREFIX_PATH" -DCMAKE_SUPPRESS_REGENERATION=ON -DCMAKE_SKIP_PACKAGE_ALL_DEPENDENCY=ON
- ninja -C build
@@ -65,7 +66,8 @@ build windows[cuda]:
- New-Item -ItemType Directory -Force 'dependencies'
- $name='BT_Interfaces'; Move-Item -Force "$name-*" dependencies/$name
- $env:CMAKE_PREFIX_PATH="$((Get-Item -Path '.').FullName)/dependencies;$env:VCPKG_CUDA_INSTALL_DIR"
- - C:/VsDevEnv.ps1 -arch=amd64
+ - . /Library.ps1
+ - VSDevEnv -arch=amd64 -vcvars_ver="14.15"
script:
- cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_PREFIX_PATH="$env:CMAKE_PREFIX_PATH" -DCMAKE_SUPPRESS_REGENERATION=ON -DCMAKE_SKIP_PACKAGE_ALL_DEPENDENCY=ON
- ninja -C build
--
GitLab