Merge pull request #179 from bcgov/feature/AB#00015-fix-to-main

Feature/ab#00015 fix to main
bcgov · Oct 29, 2024 · 1811b04 · 1811b04
2 parents cd3c466 + 9f34ea3
commit 1811b04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml
@@ -107,7 +107,7 @@ jobs:
           VERSION_PATCH=$((VERSION_PATCH + 1))
           UGM_DEPLOY_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
         else
-          echo "WARNING: Compare branch pattern != test|hotfix unable to process build! "
+          echo "WARNING: Compare branch pattern != test|hotfix/* unable to process build from ${{ needs.Branch.outputs.MERGED_BRANCH }}"
           exit 1
         fi
         echo "Main branch tagged as stable release: $UGM_DEPLOY_VERSION"

diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql
@@ -1 +1 @@
-test 15.4
+test 15.6