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

test 11.4
bcgov · Oct 29, 2024 · bacd896 · bacd896
2 parents 7ea2c71 + 11aaa7f
commit bacd896
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -70,8 +70,10 @@ jobs:
       id: get_branch
       run: |
         # Get the latest merge commit message
-        LATEST_MERGE_COMMIT=$(git log --merges --pretty=format:"%s" -1)
+        LATEST_MERGE_COMMIT=$(git log --merges --pretty=format:"%s")
         git log
+        git log --merges
+
         # Print the latest merge commit message for debugging
         echo "Latest merge commit message: $LATEST_MERGE_COMMIT"
 
@@ -85,6 +87,14 @@ jobs:
           echo "Direct push into dev branch"
           echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
         fi
+        MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
+        if [ -z "$MERGED_BRANCH" ]; then
+          echo "Direct push no pull request from bcgov/branch"
+          echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
+        else
+          echo "Merged branch: $MERGED_BRANCH"
+          echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT
+        fi
     outputs:
       SHA_SHORT: ${{steps.get_commit.outputs.SHA_SHORT}}
       MERGED_BRANCH: ${{steps.get_branch.outputs.MERGED_BRANCH}}

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