test 13

bcgov · Oct 29, 2024 · 534b8ab · 534b8ab
1 parent 950533e
commit 534b8ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml
@@ -99,19 +99,16 @@ 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 stable release"
-         #  TEST_VERSION=$(gh variable get UGM_BUILD_VERSION --env test --json value | jq -r '.value')
-         #  echo $TEST_VERSION
-         #  gh variable set UGM_BUILD_VERSION --env main --body "$TEST_VERSION"
-          gh variable set UGM_BUILD_VERSION --env dev --body "$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
-          gh variable list --env main
-          echo "UGM_BUILD_VERSION=$TEST_VERSION " >> $GITHUB_ENV
-          # Prepare tags
-          echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}$TEST_VERSION" >> $GITHUB_OUTPUT
-          echo "TAGVERSION=$TEST_VERSION" >> $GITHUB_OUTPUT
+          UGM_TEST_VERSION=$(gh variable get UGM_BUILD_VERSION --env test)
+          gh variable set UGM_BUILD_VERSION --env main --body "$UGM_TEST_VERSION"
+          echo "Latest test version tagged as stable release: $UGM_TEST_VERSION"
+          echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}$UGM_TEST_VERSION" >> $GITHUB_OUTPUT
+          echo "TAGVERSION=$UGM_TEST_VERSION" >> $GITHUB_OUTPUT
         elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then
-          echo "Incrementing patch version for hotfix version tagged as stable release"
+          echo "Incrementing patch version for hotfix release"
           VERSION_PATCH=$((VERSION_PATCH + 1))
+          UGM_HOTFIX_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
+          echo "Hotfix branch tagged as stable release: $UGM_TEST_VERSION"
           echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" >> $GITHUB_OUTPUT
           echo "TAGVERSION=$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" >> $GITHUB_OUTPUT
         fi
@@ -122,11 +119,11 @@ jobs:
         git config user.name "GitHub Actions"
         git config user.email "github-actions@users.noreply.github.com"
         if [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == "test" ]]; then
-          echo "Test branch tagged as stable release"
+          echo "Test branch tagged as stable release -m Test to Main - ${{steps.tag_selector.outputs.TAGMSG}}""
           git tag -a "${{steps.tag_selector.outputs.TAGNAME}}" -m "Test to Main - ${{steps.tag_selector.outputs.TAGMSG}}"
           git push origin "${{steps.tag_selector.outputs.TAGNAME}}"
         elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then
-          echo "Hotfix branch tagged as stable release"
+          echo "Hotfix branch tagged as stable release -m Hotfix to Main - ${{steps.tag_selector.outputs.TAGMSG}}"
           git tag -a "${{steps.tag_selector.outputs.TAGNAME}}" -m "Hotfix to Main - ${{steps.tag_selector.outputs.TAGMSG}}"
           git push origin "${{steps.tag_selector.outputs.TAGNAME}}"
         fi

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