test 6.9.1

bcgov · Oct 24, 2024 · 64bb3ca · 64bb3ca
1 parent abcb0db
commit 64bb3ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -70,7 +70,7 @@ jobs:
     - name: List merged branches
       id: get-branch
       run: |
-        echo "MERGED_BRANCH=$(gitgit log --merges --pretty=format:"%s" -1)"  >> $GITHUB_OUTPUT
+        echo "MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1)"  >> $GITHUB_OUTPUT
         MERGED_BRANCH=$(gitgit log --merges --pretty=format:"%s" -1)
         echo "Merged branch: $MERGED_BRANCH"
     - name: Set repository version variable

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