From b14d9049b33469350128913251ebbb635064b8ff Mon Sep 17 00:00:00 2001
From: FyloZ <fylozdev@gmail.com>
Date: Wed, 4 Aug 2021 21:34:18 -0400
Subject: [PATCH] Update drone CI/CD

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

diff --git a/.drone.yml b/.drone.yml
index b9e00cc..abd9354 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,6 +13,9 @@ steps:
     image: gradle:7.1-jdk11
     commands:
       - gradle test
+    when:
+      branch: develop
+      events: push
 
   - name: build
     image: gradle:7.1-jdk11
@@ -21,9 +24,8 @@ steps:
       - mv build/libs/ColorRecipesExplorer-$CRE_VERSION.jar $CRE_ARTIFACT_NAME.jar
       - echo -n "latest,$CRE_VERSION" > .tags
     when:
-      branch:
-        - master
-      events: [ push, tag ]
+      branch: master
+      events: push
 
   - name: containerize
     image: plugins/docker
@@ -32,9 +34,8 @@ steps:
         - JAVA_VERSION=11
       repo: registry.fyloz.dev:5443/colorrecipesexplorer/backend
     when:
-      branch:
-        - master
-      events: [ push, tag ]
+      branch: master
+      events: push
 
   - name: deploy
     image: alpine:latest
@@ -65,8 +66,7 @@ steps:
       - ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker pull $CRE_REGISTRY_IMAGE:latest"
       - ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker run -d -p $CRE_PORT:9090 --name=$DEPLOY_CONTAINER_NAME -v $DEPLOY_DATA_VOLUME:/usr/bin/cre/data -v $DEPLOY_CONFIG_VOLUME:/usr/bin/cre/config -e spring_profiles_active=$DEPLOY_SPRING_PROFILES $CRE_REGISTRY_IMAGE"
     when:
-      branch:
-        - master
-      events: [ push, tag ]
+      branch: master
+      events: push