From 3255441a7043cb9b35c287663c8da50f2c51820d Mon Sep 17 00:00:00 2001 From: Daryl Todosichuk Date: Mon, 28 Oct 2024 22:50:22 -0700 Subject: [PATCH] test 11.8 --- .github/workflows/docker-build-dev.yml | 3 +-- applications/scripts/datafix-ab#001.sql | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml index ec5e4ce..15a6aca 100644 --- a/.github/workflows/docker-build-dev.yml +++ b/.github/workflows/docker-build-dev.yml @@ -69,8 +69,7 @@ jobs: - name: List merged branch id: get_branch run: | - git log - git log -1 | grep -oE 'from bcgov/[^ ]+' + 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 --env ${{env.TARGET_ENV}}" diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql index e7c494c..9148c90 100644 --- a/applications/scripts/datafix-ab#001.sql +++ b/applications/scripts/datafix-ab#001.sql @@ -1 +1 @@ -test 11.7 +test 11.8