test 11.3.6

bcgov · Oct 29, 2024 · 31edaf1 · 31edaf1
1 parent 48bde87
commit 31edaf1
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
@@ -69,10 +69,12 @@ jobs:
     - name: List merged branch
       id: get_branch
       run: |
-        MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
+        # 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\///')
         echo "Extracted MERGED_BRANCH: $MERGED_BRANCH"
+        # Check if a merged branch was found
         if [ -z "$MERGED_BRANCH" ]; then
-          echo "Direct push no pull request from bcgov/branch"
+          echo "Direct push"
           echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
         else
           echo "Merged branch: $MERGED_BRANCH"

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