Revert "build: fix release workflow"

PedroTroller · Nov 4, 2020 · 4cacff1 · 4cacff1
1 parent c26299b
commit 4cacff1
Showing 1 changed file with 6 additions and 41 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
           docker-compose exec dev composer install
           docker-compose exec dev vendor/bin/behat
 
-  release-pr:
+  release-test:
     machine:
       docker_layer_caching: false
     steps:
@@ -43,7 +43,7 @@ jobs:
           npm install
           node_modules/.bin/semantic-release --dry-run
 
-  release-beta:
+  release:
     machine:
       docker_layer_caching: false
     steps:
@@ -54,9 +54,6 @@ jobs:
       - docker/install-docker
       - docker/install-docker-compose
       - docker/check
-      - run: |
-          git fetch --all
-          git rebase origin main
       - run: |
           docker-compose pull prod
           docker-compose build prod
@@ -66,51 +63,19 @@ jobs:
           npm install
           node_modules/.bin/semantic-release --ci false
 
-  release-main:
-    machine:
-      docker_layer_caching: false
-    steps:
-      - run: |
-          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-          echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-      - checkout
-      - docker/install-docker
-      - docker/install-docker-compose
-      - docker/check
-      - run: |
-          docker-compose pull prod
-          docker-compose build prod
-          docker-compose up --detach prod
-      - run: |
-          nvm install 15.0.1
-          npm install
-          node_modules/.bin/semantic-release
-
 
 workflows:
   version: 2
   workflow:
     jobs:
       - tests
-      - release-pr:
-          requires:
-            - tests
-          filters:
-            branches:
-              ignore:
-                - main
-                - beta
-      - release-beta:
-          requires:
-            - tests
-          filters:
-            branches:
-              only:
-                - beta
-      - release-main:
+      - release-test
+      - release:
           requires:
             - tests
+            - release-test
           filters:
             branches:
               only:
                 - main
+                - beta