From b30577f9d066ada35c308913ea8a93e723ea4b7a Mon Sep 17 00:00:00 2001
From: Daryl Todosichuk <daryl.todosichuk@gov.bc.ca>
Date: Fri, 25 Oct 2024 14:55:49 -0700
Subject: [PATCH] test 8.4.8

---
 .github/workflows/docker-build-dev.yml  | 4 ++--
 .github/workflows/docker-build-main.yml | 6 ++++--
 .github/workflows/docker-build-test.yml | 6 ++++--
 applications/scripts/datafix-ab#001.sql | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
index a6f3c9f..3dbb209 100644
--- a/.github/workflows/docker-build-dev.yml
+++ b/.github/workflows/docker-build-dev.yml
@@ -70,7 +70,7 @@ jobs:
       run: |
         MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
         if [ -z "$MERGED_BRANCH" ]; then
-          echo "Direct push not a pull request from bcgov/branch"
+          echo "Direct push no pull request from bcgov/branch"
           echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
         else
           echo "Merged branch: $MERGED_BRANCH"
@@ -92,7 +92,7 @@ jobs:
       id: set_version
       run: |
         gh variable set UGM_BUILD_REVISION --env ${{env.TARGET_ENV}} --body "${{needs.Branch.outputs.SHA_SHORT}}"
-        echo "env.UGM_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}}" >> $GITHUB_ENV
+        echo "UGM_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}}" >> $GITHUB_ENV
     - name: Get repository version variables
       id: get_version
       run: |
diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml
index 60cfa21..f3ed2e7 100644
--- a/.github/workflows/docker-build-main.yml
+++ b/.github/workflows/docker-build-main.yml
@@ -70,8 +70,8 @@ jobs:
       run: |
         MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
         if [ -z "$MERGED_BRANCH" ]; then
-          echo "direct push not a pull request from bcgov/branch"
-          echo "MERGED_BRANCH='push'" >> $GITHUB_OUTPUT
+          echo "Direct push no pull request from bcgov/branch"
+          echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
         else
           echo "Merged branch: $MERGED_BRANCH"
           echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT
@@ -131,7 +131,9 @@ jobs:
       id: set_version
       run: |
         gh variable set UGM_BUILD_REVISION --env ${{env.TARGET_ENV}} --body "${{needs.Branch.outputs.SHA_SHORT}}"
+        echo "UGM_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}}" >> $GITHUB_ENV
         gh variable set UGM_BUILD_VERSION --env ${{env.TARGET_ENV}} --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
+        echo "UGM_BUILD_VERSION=${{needs.GenerateTag.outputs.TAGVERSION}}" >> $GITHUB_ENV
     - name: Get repository version variables
       id: get_version
       run: |
diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index eb69400..b464236 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -70,8 +70,8 @@ jobs:
       run: |
         MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
         if [ -z "$MERGED_BRANCH" ]; then
-          echo "direct push not a pull request from bcgov/branch"
-          echo "MERGED_BRANCH='push'" >> $GITHUB_OUTPUT
+          echo "Direct push no pull request from bcgov/branch"
+          echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
         else
           echo "Merged branch: $MERGED_BRANCH"
           echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT
@@ -133,7 +133,9 @@ jobs:
       id: set_version
       run: |
         gh variable set UGM_BUILD_REVISION --env ${{env.TARGET_ENV}} --body "${{needs.Branch.outputs.SHA_SHORT}}"
+        echo "UGM_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}}" >> $GITHUB_ENV
         gh variable set UGM_BUILD_VERSION --env ${{env.TARGET_ENV}} --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
+        echo "UGM_BUILD_VERSION=${{needs.GenerateTag.outputs.TAGVERSION}}" >> $GITHUB_ENV
         gh variable set UGM_BUILD_VERSION --env dev --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
         gh variable set UGM_BUILD_VERSION --env main --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
     - name: Get repository version variables
diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql
index b3689ac..bd51bcc 100644
--- a/applications/scripts/datafix-ab#001.sql
+++ b/applications/scripts/datafix-ab#001.sql
@@ -1 +1 @@
-test 8.4.6
\ No newline at end of file
+test 8.4.8
\ No newline at end of file