From a0aa62fffe3f1b5aafa69288a212e3bee1bef019 Mon Sep 17 00:00:00 2001 From: Anderson Toshiyuki Sasaki Date: Wed, 15 Jan 2020 11:39:26 +0100 Subject: [PATCH] gitlab-ci: Create obj directory for Windows builds The obj directory is not created anymore when the git repository is cloned. Create the directory during the build. Also set the variable "ErrorActionPreference: STOP" to make the build to fail if an error occurs. Signed-off-by: Anderson Toshiyuki Sasaki Reviewed-by: Andreas Schneider (cherry picked from commit 7f5e14698fe16443f2d85a71367899a6a49dd44e) --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3563221..8570694e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -456,9 +456,11 @@ tumbleweed/static-analysis: - obj/scan visualstudio/x86_64: + variables: + ErrorActionPreference: STOP script: - $env:VCPKG_DEFAULT_TRIPLET="x64-windows" - - cd obj + - mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1} - cmake -A x64 -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE" @@ -484,9 +486,11 @@ visualstudio/x86_64: - obj/ visualstudio/x86: + variables: + ErrorActionPreference: STOP script: - $env:VCPKG_DEFAULT_TRIPLET="x86-windows" - - cd obj + - mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1} - cmake -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE" -DPICKY_DEVELOPER=ON