Updated Build WF & Release WF

ikmdev · Feb 14, 2025 · 8466216 · 8466216
1 parent b1dc1a7
commit 8466216
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,6 +7,8 @@ on:
     push:
       branches:
         - main
+      tags:        
+        - '**'
     pull_request:
       branches:
         - main
@@ -24,6 +26,6 @@ jobs:
 
   general-build-job:
     name: General Build
-    uses: ikmdev/maven-jpms-test-build-action/.github/workflows/build.yaml@main
+    uses: ikmdev/maven-jpms-test-build-action/.github/workflows/build.yaml@v1.0.0
 
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,19 +27,19 @@ jobs:
         with:
           token: ${{secrets.IKMDEVOPS_PAT_TOKEN}}
 
-      - name: Extrapolate IKM Release Property
+      - name: Verify Version
         run: |
-          CORE_VERSION=$(./mvnw help:evaluate -D'expression=core.artifact.version' -q -D'forceStdout')
-          RC_VERSION=$(./mvnw help:evaluate -D'expression=core.artifact.release' -q -D'forceStdout')
-          RC_NUMBER=$(echo "$RC_VERSION" | grep -o -E '[0-9]+')
-          NEW_RC_NUMBER=$((1 + $RC_NUMBER))
-          echo "$CORE_VERSION-r$NEW_RC_NUMBER"
-          exit 1
-
-
+            CURRENT_VERSION=$(./mvnw help:evaluate -D'expression=project.version' -q -D'forceStdout')
+            CORE_VERSION=$(./mvnw help:evaluate -D'expression=core.artifact.version' -q -D'forceStdout')
+            if [[ "$CURRENT_VERSION" != *"$CORE_VERSION"* ]]; then
+               echo "::error::Current Version Does Not Match Core Version"
+               echo "::error::Current Version: $CURRENT_VERSION"
+               echo "::error::Core Version: $CORE_VERSION"
+               exit 1
+            fi
 
       - name: Shared Release Action
         uses: ikmdev/maven-semver-release-action@v2
         with:
           version_type: 'pre-release'
-          github_token: ${{secrets.GITHUB_TOKEN}}
+          github_token: ${{secrets.GITHUB_TOKEN}}