From 18e964411679e2b4c00bafa94efbf47eca8ce6d6 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Mon, 1 Jan 2018 20:00:54 -1000
Subject: [PATCH] Windows CI fixes

---
 .gitlab-ci.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5539c2096..9208d312b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,8 +118,7 @@ build:linux:avx2:
   tags:
     - win32
   script:
-    - set PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64"
-    - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+    - 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64'
     - mkdir build
     - cd build
     - >
@@ -130,12 +129,12 @@ build:linux:avx2:
       -DURDE_VECTOR_ISA=%URDE_VECTOR_ISA%
       ..
     - ninja urde hecl visigen
-    - cp Editor\urde.exe %CI_PROJECT_DIR%\urde.exe
-    - pdbcopy Editor\urde.pdb %CI_PROJECT_DIR%\urde.pdb -p
-    - cp hecl\driver\hecl.exe %CI_PROJECT_DIR%\hecl.exe
-    - pdbcopy hecl\driver\hecl.pdb %CI_PROJECT_DIR%\hecl.pdb -p
-    - cp visigen\visigen.exe %CI_PROJECT_DIR%\visigen.exe
-    - pdbcopy visigen\visigen.pdb %CI_PROJECT_DIR%\visigen.pdb -p
+    - 'copy Editor\urde.exe "%CI_PROJECT_DIR%\urde.exe"'
+    - 'pdbcopy Editor\urde.pdb "%CI_PROJECT_DIR%\urde.pdb" -p'
+    - 'copy hecl\driver\hecl.exe "%CI_PROJECT_DIR%\hecl.exe"'
+    - 'pdbcopy hecl\driver\hecl.pdb "%CI_PROJECT_DIR%\hecl.pdb" -p'
+    - 'copy visigen\visigen.exe "%CI_PROJECT_DIR%\visigen.exe"'
+    - 'pdbcopy visigen\visigen.pdb "%CI_PROJECT_DIR%\visigen.pdb" -p'
   only:
     - release
   artifacts: