From 5b3c0291ae210a0590d7c4152ce453758b15a919 Mon Sep 17 00:00:00 2001
From: Asher <asher.dawes@gmail.com>
Date: Tue, 17 Dec 2019 12:34:58 -0800
Subject: [PATCH 1/2] Repackage produced Agama zip for Windows Remove nsis
 packaging for Windows

---
 .gitlab-ci.yml | 11 ++++-------
 package.json   |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e983b889..00bcfb5a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ variables:
   AGAMA_APPIMAGE: Agama-Linux-v${AGAMA_VERSION}.AppImage
   AGAMA_LINUX_TAR: Agama-Linux-v${AGAMA_VERSION}.tar.gz
   AGAMA_WINDOWS_ZIP: Agama-Windows-v${AGAMA_VERSION}.zip
-  AGAMA_WINDOWS_NSIS: Agama-Windows-v${AGAMA_VERSION}.exe
   AGAMA_MACOS: Agama-MacOS-v${AGAMA_VERSION}.dmg
   GIT_SUBMODULE_STRATEGY: recursive
   POST_COMMENT: "Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
@@ -115,9 +114,11 @@ build:windows:
   script:
     - yarn run dist-win
     - cd dist
+    - unzip ${VERUS_WINDOWS_ZIP} -d Verus-Windows-v${VERUS_VERSION}
+    - rm ${VERUS_WINDOWS_ZIP}
+    - zip -r ${VERUS_WINDOWS_ZIP} Verus-Windows-v${VERUS_VERSION}
     - sha256sum ${AGAMA_WINDOWS_ZIP} > ${AGAMA_WINDOWS_ZIP}.sha256
-    - sha256sum ${AGAMA_WINDOWS_NSIS} > ${AGAMA_WINDOWS_NSIS}.sha256
-    - mv ${AGAMA_WINDOWS_ZIP} ${AGAMA_WINDOWS_ZIP}.sha256 ${AGAMA_WINDOWS_NSIS} ${AGAMA_WINDOWS_NSIS}.sha256 ..
+    - mv ${AGAMA_WINDOWS_ZIP} ${AGAMA_WINDOWS_ZIP}.sha256 ..
   after_script:
     - curl -F file=@"$AGAMA_WINDOWS_ZIP"
       -F channels="$AGAMA_POST_CHANNEL"
@@ -128,8 +129,6 @@ build:windows:
     paths:
       - ${AGAMA_WINDOWS_ZIP}
       - ${AGAMA_WINDOWS_ZIP}.sha256
-      - ${AGAMA_WINDOWS_NSIS}
-      - ${AGAMA_WINDOWS_NSIS}.sha256
       - dist
     expire_in: 1 week
 ########################################################################################################################
@@ -203,6 +202,4 @@ deploy:
       - ${AGAMA_WINDOWS_ZIP}.sha256
       - ${AGAMA_MACOS}
       - ${AGAMA_MACOS}.sha256
-      - ${AGAMA_WINDOWS_NSIS}
-      - ${AGAMA_WINDOWS_NSIS}.sha256
     expire_in: 1 week
diff --git a/package.json b/package.json
index f19fb813a..b6eb11d98 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,6 @@
     "win": {
       "artifactName": "${productName}-Windows-v${version}.${ext}",
       "target": [
-        "nsis",
         "zip"
       ],
       "icon": "assets/icons/agama_app_icon.ico"

From 27c482c59215ea91831b8af35e4215a3a9a7e091 Mon Sep 17 00:00:00 2001
From: Asher <asher.dawes@gmail.com>
Date: Tue, 17 Dec 2019 12:45:27 -0800
Subject: [PATCH 2/2] Fix win build

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00bcfb5a3..c37e3dda7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,9 +114,9 @@ build:windows:
   script:
     - yarn run dist-win
     - cd dist
-    - unzip ${VERUS_WINDOWS_ZIP} -d Verus-Windows-v${VERUS_VERSION}
-    - rm ${VERUS_WINDOWS_ZIP}
-    - zip -r ${VERUS_WINDOWS_ZIP} Verus-Windows-v${VERUS_VERSION}
+    - unzip ${AGAMA_WINDOWS_ZIP} -d Agama-Windows-v${AGAMA_VERSION}
+    - rm ${AGAMA_WINDOWS_ZIP}
+    - zip -r ${AGAMA_WINDOWS_ZIP} Verus-Windows-v${AGAMA}
     - sha256sum ${AGAMA_WINDOWS_ZIP} > ${AGAMA_WINDOWS_ZIP}.sha256
     - mv ${AGAMA_WINDOWS_ZIP} ${AGAMA_WINDOWS_ZIP}.sha256 ..
   after_script: