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

test 11.3.12
bcgov · Oct 29, 2024 · bb13aa1 · bb13aa1
2 parents 138bb12 + 3e76833
commit bb13aa1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -69,13 +69,18 @@ jobs:
     - name: List merged branch
       id: get_branch
       run: |
-        MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'Merge pull request #[0-9]+ from bcgov/[^ ]+')
-        if [ -z "$MERGED_BRANCH" ]; then
-          echo "Direct push into dev branch"
-          echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
-        else
+        # Get the latest merge commit message
+        LATEST_MERGE_COMMIT=$(git log --merges --pretty=format:"%s" -1)
+
+        # 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\///')
           echo "Merged branch: $MERGED_BRANCH"
           echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT
+        else
+          echo "Direct push into dev branch"
+          echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
         fi
     outputs:
       SHA_SHORT: ${{steps.get_commit.outputs.SHA_SHORT}}

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