From 6d548b8c572a857aab116ab3b5fc119143a02383 Mon Sep 17 00:00:00 2001 From: Daryl Todosichuk Date: Mon, 28 Oct 2024 21:07:26 -0700 Subject: [PATCH] test 11.3.10 --- .github/workflows/docker-build-dev.yml | 2 +- applications/scripts/datafix-ab#001.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml index c6b7250..6ea17a6 100644 --- a/.github/workflows/docker-build-dev.yml +++ b/.github/workflows/docker-build-dev.yml @@ -69,7 +69,7 @@ jobs: - name: List merged branch id: get_branch run: | - # Get the latest merge commit message that matches "Merge pull request * from bcgov/*" + # Get the latest merge commit message that matches "Merge pull request" 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 diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql index 0a0d5d9..cc3e5fa 100644 --- a/applications/scripts/datafix-ab#001.sql +++ b/applications/scripts/datafix-ab#001.sql @@ -1 +1 @@ -test 11.3.9 +test 11.3.10