Merge branch 'dev' into main

.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

.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