test 4.1

bcgov · Oct 23, 2024 · 5f329f2 · 5f329f2
1 parent 14992d0
commit 5f329f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -67,18 +67,18 @@ jobs:
     - name: Generate Next Git Tag
       id: tag-selector
       run: |
-        # Extract the major and minor version parts using grep
+        # Extract the major.minor.patch version parts using grep
         MAJOR_VERSION=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '^[0-9]+')
         MINOR_VERSION=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '\.[0-9]+\.' | grep -oE '[0-9]+')
         VERSION_PATCH=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '[0-9]+$')
+        # Increment Version
         echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
         VERSION_PATCH=$((VERSION_PATCH + 1))
         echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
-        UGM_BUILD_VERSION=$(echo "$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH")
-        UGM_NEW_TAG=$(echo "${{env.UGM_RELEASE_PREFIX}}${MAJOR_VERSION}.${MINOR_VERSION}.${VERSION_PATCH}")
-        echo "gittag=${UGM_NEW_TAG}" >> $GITHUB_OUTPUT
+        # Prepare tags
+        echo "gittag=(echo "${{env.UGM_RELEASE_PREFIX}}${MAJOR_VERSION}.${MINOR_VERSION}.${VERSION_PATCH}")" >> $GITHUB_OUTPUT
         echo "tagmsg=${{env.UGM_RELEASE_MESSAGE}} ${{steps.date-selector.outputs.date}}" >> $GITHUB_OUTPUT
-        echo "tagversion=$UGM_BUILD_VERSION" >> $GITHUB_OUTPUT
+        echo "tagversion==$(echo "$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH") >> $GITHUB_OUTPUT
     - name: Create Git Tag
       run: |
         git config user.name "GitHub Actions"
@@ -91,10 +91,6 @@ jobs:
         gh variable list --env dev
         gh variable set UGM_BUILD_VERSION --env dev --body "${{steps.tag-selector.outputs.tagversion}}"
         gh variable list --env dev
-    outputs: 
-      TAGNAME: ${{steps.tag-selector.outputs.gittag}}
-      TAGMESSAGE: ${{steps.tag-selector.outputs.tagmsg}}
-      TAGVERSION: ${{steps.tag-selector.outputs.tagversion}}
   Build:
     needs: [Setup,GenerateTag]
     runs-on: ubuntu-latest

diff --git a/applications/scripts/datafix-ab#004.sql b/applications/scripts/datafix-ab#004.sql
@@ -1 +1 @@
-
+test1