From 9a153e54a648ded7f3642cffa12968c7f4feee9f Mon Sep 17 00:00:00 2001
From: Derek Roberts <derek.roberts@gmail.com>
Date: Mon, 20 Nov 2023 20:00:02 -0800
Subject: [PATCH] Test merge workflow

---
 .github/workflows/.deploy.yml | 2 +-
 .github/workflows/merge.yml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index ecee3b985..5eeaf9fba 100644
--- 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
index 9b186dc10..1208a23e6 100644
--- 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,8 +51,8 @@ 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)
@@ -61,7 +60,8 @@ jobs:
     secrets: inherit
     with:
       environment: test
-      target: ${{ env.tag }}
+      tag: ${{ env.tag }}
+      target: test
 
   integration-e2e:
     name: Integration and E2E Tests