Merge branch 'dev' into main

This commit is contained in:
Alexsander Pereira
2022-02-08 16:36:29 -03:00
committed by GitHub
6 changed files with 27 additions and 23 deletions
+14 -3
View File
@@ -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
+11 -11
View File
@@ -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
-1
View File
@@ -1,5 +1,4 @@
{
"branch": "dev",
"plugins": [
[
"@semantic-release/commit-analyzer",
-6
View File
@@ -1,6 +0,0 @@
# 1.0.0 (2022-02-08)
### New
* Adding semantic versioning ([6a5294c](https://github.com/dadosfera/maestro/commit/6a5294c68bcd0794ecfa52923763468ea48ff7ba))
+1 -1
View File
@@ -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}
+1 -1
View File
@@ -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: