From 79e95cecfa4f76cc5e9848a4be38c4a6ff6dc89d Mon Sep 17 00:00:00 2001
From: Kevin Reis <contact@humenius.me>
Date: Tue, 9 Feb 2021 15:42:43 +0100
Subject: [PATCH] fix: Attempt to fix broken build

---
 .drone.yml | 89 +++++++++++-------------------------------------------
 1 file changed, 18 insertions(+), 71 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1540c56..99858b5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,3 +1,4 @@
+---
 kind: pipeline
 type: docker
 name: frontend
@@ -23,14 +24,6 @@ steps:
       - cd frontend      
       - yarn
 
-  # - name: Run unit tests
-  #   image: node
-  #   environment:
-  #     CI: true
-  #   commands:
-  #     - cd frontend      
-  #     - yarn test
-
   - name: Build and push frontend image
     image: plugins/docker
     settings:
@@ -61,9 +54,7 @@ steps:
         - frontend/node_modules
       when:
         event: push
-        status:
-        - success
-        - failure
+        status: [ success, failure ]
 
   - name: Flush cache
     image: plugins/s3-cache:1
@@ -79,17 +70,12 @@ steps:
       debug: true
       filename: frontend.tar
       when:
-        status:
-        - success
-        - failure 
+        status: [ success, failure ]
 
 trigger:
-  branch:
-    - release/*
-  event:
-    - tag
-  ref:
-    - refs/tags/* # only trigger when tagging
+  branch: release/*
+  event: tag
+  ref: refs/tags/* # only trigger when tagging
 
 ---
 kind: pipeline
@@ -118,14 +104,6 @@ steps:
       - ls -la
       - yarn
 
-  # - name: Run unit tests
-  #   image: node
-  #   environment:
-  #     CI: true
-  #   commands:
-  #     - cd frontend      
-  #     - yarn test
-
   - name: Build and push frontend dev image
     image: plugins/docker
     settings:
@@ -156,9 +134,7 @@ steps:
         - frontend/node_modules
       when:
         event: push
-        status:
-        - success
-        - failure
+        status: [ success, failure ]
 
   - name: Flush cache
     image: plugins/s3-cache:1
@@ -179,12 +155,8 @@ steps:
         - failure
 
 trigger:
-  branch:
-    exclude:
-      - release/*
-  event:
-    exclude:
-      - tag
+  event: [ push, pull_request ]
+  branch: [ master, feature/* ]
 
 ---
 kind: pipeline
@@ -219,11 +191,6 @@ steps:
       - ls -la
       - npm run test:cov
 
-  # - name: Run E2E tests
-  #   image: node
-  #     - cd backend
-  #     - npm run test:e2e
-
   - name: Build and push backend image
     image: plugins/docker
     settings:
@@ -254,9 +221,7 @@ steps:
         - backend/node_modules
       when:
         event: push
-        status:
-        - success
-        - failure
+        status: [ success, failure ]
 
   - name: Flush cache
     image: plugins/s3-cache:1
@@ -272,17 +237,12 @@ steps:
       debug: true
       filename: backend.tar
       when:
-        status:
-        - success
-        - failure
+        status: [ success, failure ]
 
 trigger:
-  branch:
-    - release/*
-  event:
-    - tag
-  ref:
-    - refs/tags/* # only trigger when tagging
+  branch: release/*
+  event: tag
+  ref: refs/tags/* # only trigger when tagging
 
 ---
 kind: pipeline
@@ -316,11 +276,6 @@ steps:
       - cd backend
       - npm run test:cov
 
-  # - name: Run E2E tests
-  #   image: node
-  #     - cd backend
-  #     - npm run test:e2e
-
   - name: Build and push backend dev image
     image: plugins/docker
     settings:
@@ -351,9 +306,7 @@ steps:
         - backend/node_modules
       when:
         event: push
-        status:
-        - success
-        - failure
+        status: [ success, failure ]
 
   - name: Flush cache
     image: plugins/s3-cache:1
@@ -369,14 +322,8 @@ steps:
       debug: true
       filename: backend-dev.tar
       when:
-        status:
-        - success
-        - failure      
+        status: [ success, failure ]  
 
 trigger:
-  branch:
-    exclude:
-      - release/*
-  event:
-    exclude:
-      - tag
\ No newline at end of file
+  event: [ push, pull_request ]
+  branch: [ master, feature/* ]