From ffe2d7550c7783838dc1ebecb2e3a9994332146d Mon Sep 17 00:00:00 2001 From: Daryl Todosichuk Date: Mon, 28 Oct 2024 22:58:20 -0700 Subject: [PATCH] test 12 --- .github/workflows/docker-build-test.yml | 7 +++---- applications/scripts/datafix-ab#001.sql | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index bbc42d4..1faa916 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -69,11 +69,10 @@ jobs: - name: List merged branch id: get_branch run: | - # 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\///') - # Check if a merged branch was found + git log -1 + MERGED_BRANCH=$(git log -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///') if [ -z "$MERGED_BRANCH" ]; then - echo "Direct push into test branch" + echo "Direct push into --env ${{env.TARGET_ENV}}" 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 index 9148c90..dd166d2 100644 --- a/applications/scripts/datafix-ab#001.sql +++ b/applications/scripts/datafix-ab#001.sql @@ -1 +1 @@ -test 11.8 +test 12