Merge pull request #147 from bcgov/bugfix/AB#0006-merges

test 11.5
bcgov · Oct 29, 2024 · f03c80b · f03c80b
2 parents bacd896 + 1f0456c
commit f03c80b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -62,7 +62,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
-          fetch-depth: '1'
+          fetch-depth: '2'
     - name: Get short commitId
       id: get_commit
       run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
@@ -72,7 +72,7 @@ jobs:
         # Get the latest merge commit message
         LATEST_MERGE_COMMIT=$(git log --merges --pretty=format:"%s")
         git log
-        git log --merges
+        git log | grep -oE 'from bcgov/[^ ]+'
 
         # Print the latest merge commit message for debugging
         echo "Latest merge commit message: $LATEST_MERGE_COMMIT"

diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql
@@ -1 +1 @@
-test 11.4
+test 11.5