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

test 11.3.14
bcgov · Oct 29, 2024 · 7ea2c71 · 7ea2c71
2 parents b9012ba + 197eecb
commit 7ea2c71
Show file tree

Hide file tree

Showing 2 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,13 +70,15 @@ jobs:
       id: get_branch
       run: |
         # Get the latest merge commit message
-        git log -2
         LATEST_MERGE_COMMIT=$(git log --merges --pretty=format:"%s" -1)
+        git log
+        # Print the latest merge commit message for debugging
+        echo "Latest merge commit message: $LATEST_MERGE_COMMIT"
 
         # Check if the latest merge commit matches "Merge pull request * from bcgov/*"
         if echo "$LATEST_MERGE_COMMIT" | grep -qE 'Merge pull request #[0-9]+ from bcgov/[^ ]+'; then
           # Extract the branch name
-          MERGED_BRANCH=$(echo "$LATEST_MERGE_COMMIT" | grep -oE 'Merge pull request #[0-9]+ from bcgov/[^ ]+' | sed 's/Merge pull request #[0-9]\+ from bcgov\///')
+          MERGED_BRANCH=$(echo "$LATEST_MERGE_COMMIT" | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
           echo "Merged branch: $MERGED_BRANCH"
           echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT
         else

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