CI: build windows binaries only

veyon · Feb 5, 2020 · 9282c34 · 9282c34
1 parent c403168
commit 9282c34
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.ci/windows/build.sh b/.ci/windows/build.sh
@@ -17,11 +17,10 @@ cmake $BASEDIR -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/cmake/modules/Win${1}Toolchain.cm
 echo Building on $CPUS CPUs
 
 if [ -z "$2" ] ; then
-	make -j$CPUS
-	make win-nsi
+	make windows-binaries -j$CPUS
 else
 	make ${@:2} -j$CPUS
 fi
 
-mv -v veyon*setup.exe $BASEDIR
+mv veyon-win* $BASEDIR
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,22 +3,22 @@ image: docker:latest
 stages:
   - build
 
-build-win32-installer:
+build-win32:
   stage: build
   image: $IMAGE
   script:
     - .ci/windows/build.sh 32
   artifacts:
-    paths: [ "*.exe" ]
+    paths: [ veyon-win32* ]
     expire_in: 1 day
 
-build-win64-installer:
+build-win64:
   stage: build
   image: $IMAGE
   script:
     - .ci/windows/build.sh 64
   artifacts:
-    paths: [ "*.exe" ]
+    paths: [ veyon-win64* ]
     expire_in: 1 day
 
 variables: