From aa2a21f1c1c7a0c884350d04ac74b7043ae28be2 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 3 Mar 2020 17:18:18 +0000
Subject: [PATCH] Draft better pre-release handling in CI

---
 .gitlab-ci.yml                     |  2 +-
 app/builder-config-raspi-pre.yaml  | 15 +++++++++++++++
 app/builder-config-x86_64-pre.yaml | 27 +++++++++++++++++++++++++++
 package.json                       |  1 +
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 app/builder-config-raspi-pre.yaml
 create mode 100644 app/builder-config-x86_64-pre.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a7c9809..eec3fe3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ build:
   script:
     - npm install
     - npm run build:app
-    - npm run release
+    - if [ "$CI_COMMIT_REF_NAME" == "stable"]; then npm run release; else npm run release:pre; fi
 
   artifacts:
     name: "dist"
diff --git a/app/builder-config-raspi-pre.yaml b/app/builder-config-raspi-pre.yaml
new file mode 100644
index 00000000..cfeb66f0
--- /dev/null
+++ b/app/builder-config-raspi-pre.yaml
@@ -0,0 +1,15 @@
+extends: app/builder-config-base.yaml
+artifactName: ${name}-${os}-${arch}.${ext}
+electronVersion: 3.0.13
+linux:
+  target:
+    - target: deb
+      arch:
+        - armv7l
+    - target: appImage
+      arch:
+        - armv7l
+  icon: app/icons/png/
+  category: Science
+deb:
+  fpm: ['--architecture', 'armhf']
diff --git a/app/builder-config-x86_64-pre.yaml b/app/builder-config-x86_64-pre.yaml
new file mode 100644
index 00000000..9c08d27a
--- /dev/null
+++ b/app/builder-config-x86_64-pre.yaml
@@ -0,0 +1,27 @@
+extends: app/builder-config-base.yaml
+artifactName: ${name}-${os}-${arch}.${ext}
+win:
+  target:
+    - NSIS
+  icon: app/icons/win/icon.ico
+linux:
+  target:
+    - target: deb
+      arch:
+        - x64
+    - target: appImage
+      arch:
+        - x64
+  icon: app/icons/png/
+  category: Science
+mac:
+  icon: app/icons/mac/icon.icns
+  category: public.app-category.utilities
+dmg:
+  contents:
+    - x: 110
+      y: 150
+    - x: 240
+      y: 150
+      type: link
+      path: /Applications
diff --git a/package.json b/package.json
index 2320be0d..cd6d9e48 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "dist:dmg": "electron-builder --mac --config app/builder-config-x86_64.yaml",
     "dist:appx": "electron-builder --win --config app/builder-config-appx.yaml",
     "release": "electron-builder --linux --config app/builder-config-raspi.yaml & electron-builder --win --linux --config app/builder-config-x86_64.yaml",
+    "release:pre": "electron-builder --linux --config app/builder-config-raspi-pre.yaml & electron-builder --win --linux --config app/builder-config-x86_64-pre.yaml",
     "make-icons": "electron-icon-builder --input=./app/icons/icon_base.png --output=./app/"
   },
   "dependencies": {