Test merge workflow

bcgov · Nov 21, 2023 · 9a153e5 · 9a153e5
1 parent 869c2d8
commit 9a153e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -25,7 +25,7 @@ on:
         type: string
         default: ${{ github.event.number }}
       triggers:
-        description: Paths used to trigger a deploy; omit=always; e.g. ('backend/' 'frontend/')
+        description: Paths to trigger a deploy; omit=always; e.g. ('backend/' 'frontend/')
         required: false
         type: string
 

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -29,7 +29,6 @@ jobs:
 
       # Create tag and output semver
       - name: Create Tags
-        if: ${{ steps.changelog.outputs.tag != '' }}
         run: |
           echo git tag ${{ steps.changelog.outputs.tag }}
           echo git push origin --tag
@@ -52,16 +51,17 @@ jobs:
           repository: ${{ github.repository }}/${{ matrix.package }}
           target: ${{ github.event.number }}
           tags: |
-            ${{ needs.semver.outputs.tag }}
             latest
+            ${{ needs.semver.outputs.tag }}
 
   deploy-test:
     name: Deploy (test)
     uses: ./.github/workflows/.deploy.yml
     secrets: inherit
     with:
       environment: test
-      target: ${{ env.tag }}
+      tag: ${{ env.tag }}
+      target: test
 
   integration-e2e:
     name: Integration and E2E Tests