From 9868fec88f5e63bc24cb89d146288f81f25f454b Mon Sep 17 00:00:00 2001 From: Daryl Todosichuk Date: Mon, 28 Oct 2024 23:18:30 -0700 Subject: [PATCH] test 12.1 --- .github/workflows/docker-build-main.yml | 8 +++++--- applications/scripts/datafix-ab#001.sql | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml index 6e22773..5a01eca 100644 --- a/.github/workflows/docker-build-main.yml +++ b/.github/workflows/docker-build-main.yml @@ -67,9 +67,10 @@ jobs: - name: List merged branch id: get_branch run: | - MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/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 no pull request from bcgov/branch" + echo "Direct push into --env ${{env.TARGET_ENV}}" echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT else echo "Merged branch: $MERGED_BRANCH" @@ -98,9 +99,10 @@ jobs: echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" # Check the merged branch and set versions accordingly if [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == "test" ]]; then - echo "Latest test version tagged as main stable release" + echo "Latest test version tagged as stable release" TEST_VERSION=$(gh variable get UGM_BUILD_VERSION --env test --json | jq -r '.value') gh variable set UGM_BUILD_VERSION --env main --body "$TEST_VERSION" + elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then echo "Incrementing patch version for hotfix version tagged as stable release" VERSION_PATCH=$((VERSION_PATCH + 1)) diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql index dd166d2..b41223b 100644 --- a/applications/scripts/datafix-ab#001.sql +++ b/applications/scripts/datafix-ab#001.sql @@ -1 +1 @@ -test 12 +test 12.1