From fceecfad84608dfb8ef728297ea78cc0c112fa42 Mon Sep 17 00:00:00 2001 From: Pierre PLAZANET Date: Wed, 4 Nov 2020 15:43:33 +0100 Subject: [PATCH] build: fix release workflow --- .circleci/config.yml | 47 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e87c6f2..4174c46 100644 --- 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-test: + release-pr: machine: docker_layer_caching: false steps: @@ -43,7 +43,7 @@ jobs: npm install node_modules/.bin/semantic-release --dry-run - release: + release-beta: machine: docker_layer_caching: false steps: @@ -54,6 +54,9 @@ 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 @@ -63,19 +66,51 @@ 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-test - - release: + - release-pr: requires: - tests - - release-test filters: branches: - only: + ignore: - main - beta + - release-beta: + requires: + - tests + filters: + branches: + only: + - beta + - release-main: + requires: + - tests + filters: + branches: + only: + - main