Dev

.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))

applications/scripts/datafix-ab#001.sql

@@ -1 +1 @@
-test 12
+test 12.1