From c79238b48607091fcdc01646c85c37de4a924a65 Mon Sep 17 00:00:00 2001
From: Daryl Todosichuk <Daryl.Todosichuk@gov.bc.ca>
Date: Sun, 27 Oct 2024 16:07:17 -0700
Subject: [PATCH] test 8.5.1

---
 .github/workflows/docker-build-main.yml | 17 +++++++++++------
 applications/scripts/datafix-ab#001.sql |  2 +-
 applications/scripts/datafix-ab#006.sql |  9 ---------
 3 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 applications/scripts/datafix-ab#006.sql

diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml
index f3ed2e7..8402922 100644
--- a/.github/workflows/docker-build-main.yml
+++ b/.github/workflows/docker-build-main.yml
@@ -95,13 +95,18 @@ jobs:
         MAJOR_VERSION=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '^[0-9]+')
         MINOR_VERSION=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '\.[0-9]+\.' | grep -oE '[0-9]+')
         VERSION_PATCH=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '[0-9]+$')
-        # Increment version elements
+        # Echo the current version
         echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
-        VERSION_PATCH=$((VERSION_PATCH + 1))
-        #
-        # If main patch is from test use test versions
-        # If main patch is from hotfix branch/tag increment patch
-        #
+        # Check the merged branch and set versions accordingly
+        if [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == "test" ]]; then
+          echo "Using test versions"
+          # Set test versions here
+          UNITY_BUILD_VERSION="test-version"
+        elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then
+          echo "Incrementing patch version for hotfix"
+          VERSION_PATCH=$((VERSION_PATCH + 1))
+        fi
+        # Echo the updated version
         echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
         # Prepare tags
         echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}${MAJOR_VERSION}.${MINOR_VERSION}.${VERSION_PATCH}" >> $GITHUB_OUTPUT
diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql
index 16f4676..8191237 100644
--- a/applications/scripts/datafix-ab#001.sql
+++ b/applications/scripts/datafix-ab#001.sql
@@ -1 +1 @@
-test 8.5
\ No newline at end of file
+test 8.5.1
\ No newline at end of file
diff --git a/applications/scripts/datafix-ab#006.sql b/applications/scripts/datafix-ab#006.sql
deleted file mode 100644
index bf68def..0000000
--- a/applications/scripts/datafix-ab#006.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-test 1
-test 2
-test 3
-test 4
-test 5
-test 6
-test 7
-test 8
-test 9