From 34cbc6c1ec7c8237684809167d2dd5fcb2ca3c95 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 28 May 2019 11:59:05 +0100
Subject: [PATCH] Switch to combined builder config

---
 app/builder-config-base.yaml                     |  3 +++
 app/builder-config-linux.yaml                    | 11 -----------
 app/builder-config-raspi.yaml                    |  6 ++++--
 app/builder-config-win.yaml                      |  6 ------
 ...onfig-dmg.yaml => builder-config-x86_64.yaml} | 16 +++++++++++++++-
 5 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 app/builder-config-linux.yaml
 delete mode 100644 app/builder-config-win.yaml
 rename app/{builder-config-dmg.yaml => builder-config-x86_64.yaml} (54%)

diff --git a/app/builder-config-base.yaml b/app/builder-config-base.yaml
index 9c0642e5..d62cf387 100644
--- a/app/builder-config-base.yaml
+++ b/app/builder-config-base.yaml
@@ -4,6 +4,9 @@ directories:
 appId: org.openflexure.ev
 artifactName: ${name}-${os}-${arch}.${ext}
 asar: true
+publish:
+  - provider: generic
+    url: https://gitlab.com
 files:
   - filter:
       - '**/*'
diff --git a/app/builder-config-linux.yaml b/app/builder-config-linux.yaml
deleted file mode 100644
index 37f52c87..00000000
--- a/app/builder-config-linux.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-extends: app/builder-config-base.yaml
-linux:
-  target:
-    - target: deb
-      arch:
-        - x64
-  icon: app/icons/png/
-  category: Science
-deb:
-  category: Science
-electronVersion: 4.1.5
diff --git a/app/builder-config-raspi.yaml b/app/builder-config-raspi.yaml
index 217293e2..15c0fe82 100644
--- a/app/builder-config-raspi.yaml
+++ b/app/builder-config-raspi.yaml
@@ -1,12 +1,14 @@
 extends: app/builder-config-base.yaml
+electronVersion: 3.0.13
 linux:
   target:
     - target: deb
       arch:
         - armv7l
+    - target: appImage
+      arch:
+        - armv7l
   icon: app/icons/png/
   category: Science
 deb:
-  category: Science
   fpm: ['--architecture', 'armhf']
-electronVersion: 3.0.13
diff --git a/app/builder-config-win.yaml b/app/builder-config-win.yaml
deleted file mode 100644
index 9a6b6d37..00000000
--- a/app/builder-config-win.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-extends: app/builder-config-base.yaml
-win:
-  target:
-    - NSIS
-  icon: app/icons/win/icon.ico
-electronVersion: 4.1.5
diff --git a/app/builder-config-dmg.yaml b/app/builder-config-x86_64.yaml
similarity index 54%
rename from app/builder-config-dmg.yaml
rename to app/builder-config-x86_64.yaml
index c2ab40be..406fb7a5 100644
--- a/app/builder-config-dmg.yaml
+++ b/app/builder-config-x86_64.yaml
@@ -1,4 +1,19 @@
 extends: app/builder-config-base.yaml
+electronVersion: 4.1.5
+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
@@ -10,4 +25,3 @@ dmg:
       y: 150
       type: link
       path: /Applications
-electronVersion: 4.1.5