Start using deploy tag param

bcgov · Nov 21, 2023 · 93773ff · 93773ff
1 parent f5addf1
commit 93773ff
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -46,6 +46,10 @@ on:
         required: false
         type: string
 
+env:
+  release: ${{ github.event.repository.name }}-${{ inputs.target }}
+  tag: ${{ inputs.tag }}
+
 jobs:
   deploys:
     name: Helm
@@ -92,11 +96,11 @@ jobs:
           oc project ${{ vars.OC_NAMESPACE }} # Safeguard!
 
           # Interrupt any previous jobs (status = pending-upgrade)
-          PREVIOUS=$(helm status ${{ github.event.repository.name }}-${{ inputs.target }} -o json | jq .info.status || true)
+          PREVIOUS=$(helm status ${{ env.release }} -o json | jq .info.status || true)
           if [[ ${PREVIOUS} =~ pending ]]; then
             echo "Rollback triggered"
-            helm rollback ${{ github.event.repository.name }}-${{ inputs.target }} || \
-              helm uninstall ${{ github.event.repository.name }}-${{ inputs.target }}
+            helm rollback ${{ env.release }} || \
+              helm uninstall ${{ env.release }}
           fi
 
           # Deploy Helm Chart
@@ -105,11 +109,10 @@ jobs:
             --set global.autoscaling=${{ inputs.autoscaling }} \
             --set-string global.repository=${{ github.repository }} \
             --set-string global.secrets.databasePassword=${{ secrets.DB_PASSWORD }} \
-            --set-string global.tag="${{ inputs.target }}" \
-            --set-string backend.containers[0].tag="${{ inputs.target }}" \
-            --set-string backend.initContainers[0].tag="${{ inputs.target }}" \
-            --set-string frontend.containers[0].tag="${{ inputs.target }}" \
-            --install --wait --atomic ${{ github.event.repository.name }}-${{ inputs.target }} \
+            --set-string backend.containers[0].tag="${{ env.tag }}" \
+            --set-string backend.initContainers[0].tag="${{ env.tag }}" \
+            --set-string frontend.containers[0].tag="${{ env.tag }}" \
+            --install --wait --atomic ${{ env.release }} \
             --timeout ${{ inputs.timeout-minutes }}m \
             --values ${{ inputs.values }} .
 

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -1,16 +1,16 @@
 name: Merge
 
 on:
-  workflow_run:
-    workflows: [PR Closed]
-    types: [completed]
-  workflow_dispatch:
+  push: [${{ github.event.repository.default_branch }}]
+
+env:
+  pr: ${{ github.event.number }}
 
 jobs:
   semver:
     name: Semantic Version
     outputs:
-      tag: ${{ steps.semver.outputs.tag }}
+      semver: ${{ steps.tag.outputs.semver }}
     runs-on: ubuntu-22.04
     timeout-minutes: 1
     steps:
@@ -19,8 +19,9 @@ jobs:
           ref: ${{ github.event.repository.default_branch }}
 
       - name: Conventional Changelog Update
+        # Outputs semver as steps.id.outputs.tag
         uses: TriPSs/conventional-changelog-action@v4
-        id: semver
+        id: changelog
         with:
           git-branch: refs/heads/${{ github.event.repository.default_branch }}
           git-push: "false"
@@ -31,20 +32,22 @@ jobs:
 
       - name: Create Tags
         if: ${{ steps.semver.outputs.tag != '' }}
+        id: tag
+        # Create tag and output semver
         run: |
           git tag ${{ steps.changelog.outputs.tag }}
           git push origin --tag
+          echo "semver=${{ steps.semver.outputs.tag }}" >> $GITHUB_OUTPUT
 
   deploy-test:
     name: Deploy (test)
-    if: ${{ needs.semver.outputs.tag != '' }}
+    if: ${{ needs.semver.outputs.semver != '' }}
     needs: [semver]
     uses: ./.github/workflows/.deploy.yml
     secrets: inherit
     with:
       environment: test
-      tag: test
-      target: test
+      target: ${{ env.tag }}
 
   integration-e2e:
     name: Integration and E2E Tests
@@ -60,11 +63,11 @@ jobs:
     secrets: inherit
     with:
       environment: prod
-      tag: test
+      tag: ${{ env.tag }}
       target: prod
 
   promote-prod:
-    name: Tag Images
+    name: Promote Images
     needs: [deploy-prod]
     runs-on: ubuntu-22.04
     permissions:
@@ -78,5 +81,5 @@ jobs:
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/${{ matrix.package }}
-          target: test
+          target: ${{ env.tag }}
           tags: prod
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -74,5 +74,6 @@ jobs:
     secrets: inherit
     with:
       autoscaling: false
+      tag: ${{ github.event.number }}
       target: ${{ github.event.number }}
       triggers: ('backend/' 'frontend/' 'migrations/' 'charts/')