test 6.8

bcgov · Oct 24, 2024 · cd983e1 · cd983e1
1 parent 8c9ae47
commit cd983e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -69,11 +69,8 @@ jobs:
       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}} | tail -n 1 | sed 's/origin\///')
-        echo "Merged branches: $MERGED_BRANCHES"
-        echo "MERGED_BRANCHES=$MERGED_BRANCHES" >> $GITHUB_ENV
-        env | sort
+        echo "MERGED_BRANCH=$(gitgit log --merges --pretty=format:"%s" -1)"  >> $GITHUB_OUTPUT
+        echo "Merged branch: $MERGED_BRANCH"
     - name: Set repository version variable
       id: setversion
       run: | 

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -69,9 +69,8 @@ jobs:
       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}} | tail -n 1 | sed 's/origin\///')
-        echo "Merged branches: $MERGED_BRANCHES"
+        MERGED_BRANCH=$(gitgit log --merges --pretty=format:"%s" -1)
+        echo "Merged branch: $MERGED_BRANCH"
   GenerateTag:
     needs: [Setup]
     runs-on: ubuntu-latest

diff --git a/applications/scripts/datafix-ab#006.sql b/applications/scripts/datafix-ab#006.sql
@@ -4,4 +4,5 @@ test 3
 test 4
 test 5
 test 6
-test 7
+test 7
+test 8
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,5 @@ test 3 @@
     test 4
     test 5
     test 6
-    test 7
+    test 7
+    test 8