test 6.7

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

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -70,9 +70,10 @@ jobs:
     - name: List merged branches
       run: |
         git fetch --all
-        MERGED_BRANCHES=$(git branch -r --merged ${{env.TARGET_ENV}} | sed 's/origin\///')
+        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
     - name: Set repository version variable
       id: setversion
       run: | 

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -70,7 +70,7 @@ jobs:
     - name: List merged branches
       run: |
         git fetch --all
-        MERGED_BRANCHES=$(git branch -r --merged ${{env.TARGET_ENV}} | sed 's/origin\///')
+        MERGED_BRANCHES=$(git branch -r --merged ${{env.TARGET_ENV}} | tail -n 1 | sed 's/origin\///')
         echo "Merged branches: $MERGED_BRANCHES"
   GenerateTag:
     needs: [Setup]

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