From e6e3c77ab6fbf230289a35ffcd0241b38bbad913 Mon Sep 17 00:00:00 2001
From: Nikos Roussos <nikos@roussos.cc>
Date: Mon, 22 Feb 2021 18:01:49 +0200
Subject: [PATCH] [skip ci] New CircleCI config

Ref: https://github.com/greenpeace/planet4-nro-generator/blob/33774da42888d03bfb51e8fb91ebbddf4d4b4969/templates/nro/.circleci/config.yml.tmpl
---
 .circleci/config.yml | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b31ea03..bf13edb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -166,10 +166,6 @@ job_definitions:
       - run: make persist
       - run: make build
       - run: make push
-      - run:
-          name: Notify failure
-          when: on_fail
-          command: TYPE="Build" notify-job-failure.sh
       - save_cache:
           key: composer-v5-{{ .Branch }}-{{ .Revision }}-{{ .BuildNum }}
           paths:
@@ -344,16 +340,6 @@ jobs:
       <<: *release_environment
     <<: *deploy_steps
 
-  merge-develop:
-    <<: *defaults
-    environment:
-      <<: *common_environment
-      <<: *develop_environment
-    working_directory: /tmp/workspace/src
-    steps:
-      - checkout
-      - run: merge-develop.sh
-
   finish-staging:
     <<: *defaults
     environment:
@@ -405,9 +391,9 @@ jobs:
       - run:
           name: Configure
           command: |
-            ${HOME}/scripts/activate-gcloud-account.sh
+            activate-gcloud-account.sh
       - run: echo $SQLPROXY_KEY | base64 -d > key.json
-      - run: /home/circleci/sql_create_sync_file.sh
+      - run: sql_create_sync_file.sh
 
   sync-to-staging:
     <<: *defaults
@@ -422,9 +408,9 @@ jobs:
       - run:
           name: Configure
           command: |
-            ${HOME}/scripts/activate-gcloud-account.sh
+            activate-gcloud-account.sh
       - run: echo $SQLPROXY_KEY | base64 -d > key.json
-      - run: /home/circleci/sql_to_sync_site.sh release
+      - run: sql_to_sync_site.sh release
 
   sync-to-develop:
     <<: *defaults
@@ -439,9 +425,9 @@ jobs:
       - run:
           name: Configure
           command: |
-            ${HOME}/scripts/activate-gcloud-account.sh
+            activate-gcloud-account.sh
       - run: echo $SQLPROXY_KEY | base64 -d > key.json
-      - run: /home/circleci/sql_to_sync_site.sh develop
+      - run: sql_to_sync_site.sh develop
 
   notify-sync:
     <<: *defaults
@@ -452,7 +438,7 @@ jobs:
     steps:
       - checkout
       - run: activate-gcloud-account.sh
-      - run: /home/circleci/notify-sync-admins.sh
+      - run: notify-sync-admins.sh
 
   backup:
     docker:
@@ -474,7 +460,7 @@ workflow_definitions:
     context: org-global
     filters:
       branches:
-        only: develop
+        only: main
   on_release_tag: &on_release_tag
     context: org-global
     filters:
@@ -495,7 +481,6 @@ workflows:
           requires:
             - build-develop
             - visualtests-reference-develop
-            - merge-develop
       - test-develop:
           <<: *on_develop_commit
           requires:
@@ -504,9 +489,7 @@ workflows:
           <<: *on_develop_commit
           requires:
             - deploy-develop
-      - merge-develop:
-          <<: *on_develop_commit
-  release:
+  production:
     unless: << pipeline.parameters.rollback >>
     jobs:
       - visualtests-reference: