Updating CI/CD workflows for version release

Signed-off-by: S3B4SZ17 <[email protected]>

Author: S3B4SZ17

.github/workflows/publish.yaml

@@ -20,6 +20,7 @@ jobs:
   push_to_registry:
     name: Push Docker image to GitHub Packages
     runs-on: ubuntu-latest
+    needs: tests
     permissions:
       contents: read # required for actions/checkout
       packages: write # required for pushing to ghcr.io
@@ -77,27 +78,20 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v4
+      - name: Get tag version
         id: semantic_release
-        with:
-          dry_run: true
-          branches: |
-            [
-              '+([0-9])?(.{+([0-9]),x}).x',
-              'main',
-              {
-                name: 'beta',
-                prerelease: true
-              },
-              {
-                name: 'alpha',
-                prerelease: true
-              }
-            ]
+        uses: anothrNick/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEFAULT_BUMP: "patch"
+          TAG_CONTEXT: ${{ (github.base_ref != 'main') && 'branch' || 'repo' }}
+          PRERELEASE_SUFFIX: "beta"
+          PRERELEASE: ${{ (github.base_ref != 'main') && 'true' || 'false' }}
+          DRY_RUN: false
+          INITIAL_VERSION: ${{ needs.push_to_registry.outputs.tag }}
 
       - name: Summary
         run: |
           echo "## Release Summary
-          - Tag: ${{ steps.semantic_release.outputs.new_release_version }}
-          - Docker Image: ghcr.io/sysdiglabs/sysdig-mcp-server:v${{ steps.extract_version.outputs.VERSION }}" >> $GITHUB_STEP_SUMMARY
+          - Tag: ${{ steps.semantic_release.outputs.tag }}
+          - Docker Image: ghcr.io/sysdiglabs/sysdig-mcp-server:v${{ needs.push_to_registry.outputs.version }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/test.yaml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
   pull_request:
-  workflow_dispatch:
+  workflow_call:
 
 jobs:
   test:
@@ -45,33 +45,42 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}   # checkout the correct branch name
+          fetch-depth: 0   
 
       - name: Extract current version
         id: pyproject_version
         run: |
           TAG=v$(grep 'version =' pyproject.toml | sed -e 's/version = "\(.*\)"/\1/')
           echo "TAG=$TAG" >> "$GITHUB_OUTPUT"
 
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v4
+      - name: Get tag version
         id: semantic_release
-        with:
-          ci: false
-          dry_run: true
-        
+        uses: anothrNick/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEFAULT_BUMP: "patch"
+          TAG_CONTEXT: ${{ (github.base_ref != 'main') && 'branch' || 'repo' }}
+          PRERELEASE_SUFFIX: "beta"
+          PRERELEASE: ${{ (github.base_ref != 'main') && 'true' || 'false' }}
+          DRY_RUN: true
+          INITIAL_VERSION: ${{ steps.pyproject_version.outputs.TAG }}
+
       - name: Compare versions
         run: |
           echo "Current version: ${{ steps.pyproject_version.outputs.TAG }}"
-          echo "New version: ${{ steps.semantic_release.outputs.new_release_version }}"
-          if [ "${{ steps.pyproject_version.outputs.TAG }}" != "${{ steps.semantic_release.outputs.new_release_version }}" ]; then
+          echo "New version: ${{ steps.semantic_release.outputs.tag }}"
+          if [ "${{ steps.pyproject_version.outputs.TAG }}" != "${{ steps.semantic_release.outputs.tag }}" ]; then
             echo "### Version mismatch detected! :warning:
-            Current version: ${{ steps.pyproject_version.outputs.TAG }}
-            New version: **${{ steps.semantic_release.outputs.new_release_version }}**
+            Current pyproject version: ${{ steps.pyproject_version.outputs.TAG }}
+            New Tag version: **${{ steps.semantic_release.outputs.tag }}**
+            Current Tag: ${{ steps.semantic_release.outputs.old_tag }}
             Please update the version in pyproject.toml." >> $GITHUB_STEP_SUMMARY
             exit 1
           else
             echo "### Version match confirmed! :rocket:
-            Current version: ${{ steps.pyproject_version.outputs.TAG }}
-            New version: **${{ steps.semantic_release.outputs.new_release_version }}**
+            Current pyproject version: ${{ steps.pyproject_version.outputs.TAG }}
+            New Tag version: **${{ steps.semantic_release.outputs.tag }}**
             The version is up-to-date." >> $GITHUB_STEP_SUMMARY
           fi