From dbcac749a332066e6e71b83bda1bf9a380f48115 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 May 2019 15:03:33 +0100
Subject: [PATCH] Moved nuspec to build stage, pack to deploy stage

---
 .gitlab-ci.yml    | 9 ++++++---
 app/make-nupkg.sh | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c52a87f..2f9c9cf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,19 +8,22 @@ build:
   script:
     - npm install
     - npm run release
+    - chmod +x ./app/make-nupkg.sh
+    - ./app/make-nupkg.sh
+
   artifacts:
     paths:
       - release-builds/*.exe
       - release-builds/*.deb
       - release-builds/*.AppImage
+      - release-builds/*.nuspec
+      - release-builds/*.ps1
 
 deploy:
   stage: deploy
   image: patrickhuber/choco-linux
   script:
-    - chmod +x ./app/make-nupkg.sh
-    - ./app/make-nupkg.sh
+    - choco pack --allow-unofficial --outputdirectory "./release-builds/choco" "./release-builds/choco/openflexure-ev.nuspec"
   artifacts:
     paths:
-      - release-builds/*.nuspec
       - release-builds/*.nupkg
\ No newline at end of file
diff --git a/app/make-nupkg.sh b/app/make-nupkg.sh
index 6cc60350..1c979e6b 100644
--- a/app/make-nupkg.sh
+++ b/app/make-nupkg.sh
@@ -68,4 +68,4 @@ instPS1="Install-ChocolateyPackage $packageName $fileType $silentArgs $instURL"
 echo $instPS1 > "$toolspath/chocolateyInstall.ps1"
 
 # Build nupkg
-choco pack --allow-unofficial --outputdirectory $outpath "$outpath/openflexure-ev.nuspec"
\ No newline at end of file
+# choco pack --allow-unofficial --outputdirectory $outpath "$outpath/openflexure-ev.nuspec"
\ No newline at end of file