From 1326847af1e144cb1c59c5c0324ef2c3876cc114 Mon Sep 17 00:00:00 2001 From: Daryl Todosichuk Date: Thu, 24 Oct 2024 18:01:59 -0700 Subject: [PATCH] test 7.3 --- .github/workflows/docker-build-dev.yml | 2 +- .github/workflows/docker-build-test.yml | 6 +++++- applications/scripts/datafix-ab#007.sql | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml index 53e7f76..55f4151 100644 --- a/.github/workflows/docker-build-dev.yml +++ b/.github/workflows/docker-build-dev.yml @@ -72,7 +72,7 @@ jobs: run: | MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///') if [ -z "$MERGED_BRANCH" ]; then - echo "direct push no PR" + echo "direct push no from bcgov/branch PR" else echo "Merged branch: $MERGED_BRANCH" fi diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 367b296..b7b1671 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -70,9 +70,13 @@ jobs: - name: List merged branch id: get-branch run: | - echo "MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')" >> $GITHUB_OUTPUT MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///') + if [ -z "$MERGED_BRANCH" ]; then + echo "direct push no from bcgov/branch PR" + else echo "Merged branch: $MERGED_BRANCH" + fi + echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT GenerateTag: needs: [Setup] runs-on: ubuntu-latest diff --git a/applications/scripts/datafix-ab#007.sql b/applications/scripts/datafix-ab#007.sql index 9f78117..8bed73c 100644 --- a/applications/scripts/datafix-ab#007.sql +++ b/applications/scripts/datafix-ab#007.sql @@ -1,2 +1,3 @@ test 1 -test 2 \ No newline at end of file +test 2 +test 3 \ No newline at end of file