From 36d73efd69315ef14dd99988bb13405ca105b464 Mon Sep 17 00:00:00 2001
From: Joel Collins <2579603-jtc42@users.noreply.gitlab.com>
Date: Fri, 23 Aug 2019 14:36:53 +0000
Subject: [PATCH] Run build on merge request, not on tags, deploy ONLY on
 stable merge

---
 .gitlab-ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89931fff..7851480d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:
     - npm run release
   artifacts:
     name: "dist"
-    expire_in: 1 hour
+    expire_in: 1 week
     paths:
       - "./release-builds/*.AppImage"
       - "./release-builds/*.exe"
@@ -26,10 +26,10 @@ build:
       - "./release-builds/latest*.yml"
       - "./release-builds/beta*.yml"
   only:
-    - web
+    - merge_requests
     - stable
-    - tags
-
+    - web
+    
 # Deploy to builds.openflexure.org
 deploy:
   stage: deploy
@@ -47,5 +47,4 @@ deploy:
     - rsync -hrvz -e ssh release-builds/ ci-user@openflexure.bath.ac.uk:/var/www/build/openflexure-ev/
     - ssh -t ci-user@openflexure.bath.ac.uk "/var/www/build/update-latest.py"
   only:
-    - web
     - stable