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

test 11.3.9
bcgov · Oct 29, 2024 · 221bea9 · 221bea9
2 parents 0878621 + 5f18350
commit 221bea9
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:
       id: get_branch
       run: |
         # Get the latest merge commit message that matches "Merge pull request * from bcgov/*"
-        MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -5 | grep -oE 'Merge pull request #[0-9]+ from bcgov/[^ ]+' | head -n 1 | sed 's/Merge pull request #[0-9]\+ from bcgov\///')
+        MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'Merge pull request #[0-9]+ from bcgov/[^ ]+')
         # Check if a merged branch was found
         if [ -z "$MERGED_BRANCH" ]; then
           echo "Direct push into dev branch"

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