From 793c8e2c7edf44966b3925968933b2bc1d804a60 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Sun, 2 Jun 2019 22:03:49 +0100
Subject: [PATCH] Condensed build:app into package

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dd719a1..9a3f8a91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 stages:
   - build
-  - package
   - meta
 
 # Cache modules in between jobs
@@ -9,7 +8,7 @@ cache:
   paths:
   - node_modules/
 
-# Build basic webapp
+# Basic webapp build
 build:
   stage: build
   image: electronuserland/builder:wine
@@ -25,30 +24,13 @@ build:
     - tags
     - web
 
-# Build electron webapp
-build:electron:
+# Electron app build
+package:
   stage: build
   image: electronuserland/builder:wine
   script:
     - npm install
     - npm run build:app
-  artifacts:
-    name: "build"
-    paths:
-      - app/dist/
-  only:
-    - stable
-    - tags
-    - web
-
-# Platform-specific Electron builds
-package:
-  stage: package
-  dependencies:
-    - build:electron
-  image: electronuserland/builder:wine
-  retry: 2
-  script:
     - npm run release
     - mv ./release-builds/*.AppImage .
     - mv ./release-builds/*.deb .