diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml index 6ea17a6..4888529 100644 --- a/.github/workflows/docker-build-dev.yml +++ b/.github/workflows/docker-build-dev.yml @@ -69,9 +69,7 @@ jobs: - name: List merged branch id: get_branch run: | - # 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 echo "Direct push into dev branch" echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql index cc3e5fa..95e4d57 100644 --- a/applications/scripts/datafix-ab#001.sql +++ b/applications/scripts/datafix-ab#001.sql @@ -1 +1 @@ -test 11.3.10 +test 11.3.11