diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5d1e52f..cfd4972 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,17 @@ jobs: @semantic-release/git conventional-changelog-eslint branches: | - ['main'] + [ + 'main', + { + name: 'dev', + prerelease: true + }, + { + name: 'stg', + prerelease: true + } + ] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -65,17 +75,18 @@ jobs: - name: Build, Tag, and Push Image to AWS ECR env: ENV: ${{ steps.extract_environment.outputs.result }} - IMAGE_TAG: latest + IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }} run: | - export ENV=$ENV docker-compose -f build.docker-compose.yml build docker-compose -f build.docker-compose.yml push - name: Create ZIP file to Deploy AWS Beanstalk env: ENV: ${{ steps.extract_environment.outputs.result }} + IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }} run: | sed -i -e "s/\${ENV}/$ENV/g" docker-compose.yml + sed -i -e "s/\${IMAGE_TAG}/$IMAGE_TAG/g" docker-compose.yml zip deploy.zip docker-compose.yml - name: Deploy AWS Beanstalk diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 69981be..8927609 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,15 +17,15 @@ jobs: run: | python3 -m pip install docker-compose --upgrade - - name: Build - env: - ENV: ${{ steps.extract_environment.outputs.result }} - IMAGE_TAG: latest - run: | - export ENV=test - docker-compose -f build.docker-compose.yml build + - name: Build + env: + ENV: ${{ steps.extract_environment.outputs.result }} + IMAGE_TAG: latest + run: | + export ENV=test + docker-compose -f build.docker-compose.yml build - - name: Run Test - run: | - export ENV=test - docker-compose run --rm --entrypoint="npm run test" maestro + - name: Run Test + run: | + export ENV=test + docker-compose run --rm --entrypoint="npm run test" maestro diff --git a/.releaserc.json b/.releaserc.json index 49fa875..bf1c914 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -1,5 +1,4 @@ { - "branch": "dev", "plugins": [ [ "@semantic-release/commit-analyzer", diff --git a/CHANGELOG.md b/CHANGELOG.md index a4e503d..e69de29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +0,0 @@ -# 1.0.0 (2022-02-08) - - -### New - -* Adding semantic versioning ([6a5294c](https://github.com/dadosfera/maestro/commit/6a5294c68bcd0794ecfa52923763468ea48ff7ba)) diff --git a/build.docker-compose.yml b/build.docker-compose.yml index f381cd6..0cf1027 100644 --- a/build.docker-compose.yml +++ b/build.docker-compose.yml @@ -2,4 +2,4 @@ version: "3.8" services: maestro: build: . - image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:latest + image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG} diff --git a/docker-compose.yml b/docker-compose.yml index 514fd97..619f44f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: maestro: - image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:latest + image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG} container_name: maestro restart: always ports: