From ae24ca621362e545917ac9f232f3f27c48b5a96e Mon Sep 17 00:00:00 2001
From: Daryl Todosichuk <daryl.todosichuk@gov.bc.ca>
Date: Thu, 24 Oct 2024 15:25:00 -0700
Subject: [PATCH] test 6.5

---
 .github/workflows/docker-build-dev.yml  |  4 ++--
 .github/workflows/docker-build-test.yml | 24 +++++++++++++++++++++++-
 applications/scripts/datafix-ab#006.sql |  3 ++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
index 02d0a73..30b37d2 100644
--- a/.github/workflows/docker-build-dev.yml
+++ b/.github/workflows/docker-build-dev.yml
@@ -51,7 +51,7 @@ jobs:
         echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
         echo "..."
         env | sort
-  GetBranch:
+  BranchInfo:
     needs: [Setup]
     runs-on: ubuntu-latest
     environment: dev
@@ -81,7 +81,7 @@ jobs:
         gh variable list --env ${{env.TARGET_ENV}}
         echo "buildArgs UNITY_BUILD_VERSION: ${{env.UGM_BUILD_VERSION}}, UNITY_BUILD_REVISION: ${{env.UGM_BUILD_REVISION}}"
   Build:
-    needs: [Setup,GetBranch]
+    needs: [Setup,BranchInfo]
     runs-on: ubuntu-latest
     environment: dev
     steps:
diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index 901f255..da8303a 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -51,6 +51,28 @@ jobs:
         echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
         echo "..."
         env | sort
+  BranchInfo:
+    needs: [Setup]
+    runs-on: ubuntu-latest
+    environment: dev
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+          fetch-depth: '0'
+    - name: Get short commitId
+      id: get-commit
+      run:  |
+        echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+    - name: Get current date
+      id: date-selector
+      run: echo "date=$(date +'%B %e, %Y')" >> $GITHUB_OUTPUT
+    - name: List merged branches
+      run: |
+        git fetch --all
+        MERGED_BRANCHES=$(git branch -r --merged ${{env.TARGET_ENV}} | sed 's/origin\///')
+        echo "Merged branches: $MERGED_BRANCHES"
+        echo "MERGED_BRANCHES=$MERGED_BRANCHES" >> $GITHUB_ENV
   GenerateTag:
     needs: [Setup]
     runs-on: ubuntu-latest
@@ -100,7 +122,7 @@ jobs:
         gh variable list --env dev
         echo "buildArgs --env ${{env.TARGET_ENV}} UNITY_BUILD_VERSION: ${{env.UGM_BUILD_VERSION}}, UNITY_BUILD_REVISION: ${{env.UGM_BUILD_REVISION}}"
   Build:
-    needs: [Setup,GenerateTag]
+    needs: [Setup,BranchInfo,GenerateTag]
     runs-on: ubuntu-latest
     environment: test
     steps:
diff --git a/applications/scripts/datafix-ab#006.sql b/applications/scripts/datafix-ab#006.sql
index f9e4cfa..4b3a11f 100644
--- a/applications/scripts/datafix-ab#006.sql
+++ b/applications/scripts/datafix-ab#006.sql
@@ -1,4 +1,5 @@
 test 1
 test 2
 test 3
-test 4
\ No newline at end of file
+test 4
+test 5
\ No newline at end of file