From f785253eced0801878587af07aeacf0174c6327e Mon Sep 17 00:00:00 2001 From: alexsanderp Date: Thu, 10 Feb 2022 11:16:04 -0300 Subject: [PATCH] CI: Adding @saithodev/semantic-release-backmerge to merge main into alpha and beta after new release published --- .github/workflows/deploy.yml | 8 ++++++++ .releaserc.json | 7 +++++++ package.json | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a856d80..87a14c3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,6 +19,7 @@ jobs: with: semantic_version: 16 extra_plugins: | + @saithodev/semantic-release-backmerge conventional-changelog-eslint branches: | [ @@ -36,27 +37,33 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update Pip + if: steps.semantic.outputs.new_release_published == 'true' run: | python3 -m pip install --upgrade pip - name: Install Docker Compose + if: steps.semantic.outputs.new_release_published == 'true' run: | python3 -m pip install docker-compose --upgrade - name: Install AWS CLI + if: steps.semantic.outputs.new_release_published == 'true' run: | python3 -m pip install awscli --upgrade - name: Install AWS Elastic Beanstalk CLI + if: steps.semantic.outputs.new_release_published == 'true' run: | python3 -m pip install awsebcli --upgrade - name: Configure AWS Region + if: steps.semantic.outputs.new_release_published == 'true' uses: aws-actions/configure-aws-credentials@v1 with: aws-region: us-east-1 - name: Extract Environment + if: steps.semantic.outputs.new_release_published == 'true' shell: bash run: | if [ ${GITHUB_REF} == "refs/heads/main" ]; then @@ -67,6 +74,7 @@ jobs: id: extract_environment - name: Login to AWS ECR + if: steps.semantic.outputs.new_release_published == 'true' id: login_ecr uses: aws-actions/amazon-ecr-login@v1 diff --git a/.releaserc.json b/.releaserc.json index f134eeb..851a670 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -26,6 +26,13 @@ "preset": "eslint" } ], + [ + "@saithodev/semantic-release-backmerge", + { + "branches": ["alpha", "beta"], + "backmergeStrategy": "merge" + } + ], "@semantic-release/github" ] } diff --git a/package.json b/package.json index 7358f0d..3f02885 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grpc-server-and-client-nestjs-micro-pattern", - "version": "1.0.1-alpha.1", + "version": "0.0.0", "description": "", "author": "", "private": true,