fix: Updating workflow tagging for correct branch context

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

Author: S3B4SZ17

.github/workflows/helm_test.yaml

@@ -21,35 +21,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  set-charts:
-    # Required permissions
-    permissions:
-      contents: read
-      pull-requests: read
-    outputs:
-      charts: ${{ steps.charts.outputs.changes }}
-    name: "Set Charts"
-    runs-on: [ubuntu-latest]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v2
-        id: charts
-        with:
-          base: ${{ github.ref_name }}
-          filters: |
-            sysdig-mcp:
-              - 'charts/sysdig-mcp/**'
   lint-charts:
-    needs: set-charts
     name: Lint new helm charts
     runs-on: [ubuntu-latest]
-    strategy:
-      matrix:
-        chart: ${{ fromJSON(needs.set-charts.outputs.charts) }}
-      # When set to true, GitHub cancels all in-progress jobs if any matrix job fails.
-      fail-fast: false
-      # The maximum number of jobs that can run simultaneously
-      max-parallel: 3
     steps:
 
     - uses: actions/checkout@v4
@@ -82,9 +56,9 @@ jobs:
       run: ct lint --target-branch ${{ github.event.repository.default_branch }} --chart-dirs charts
 
     - name: Create kind cluster
-      if: steps.list-changed.outputs.changed == 'true'
+      if: steps.list-changed.outputs.changed == 'true' || github.ref_name == 'main'
       uses: helm/[email protected]
 
     - name: Run chart-testing (install)
-      if: steps.list-changed.outputs.changed == 'true'
+      if: steps.list-changed.outputs.changed == 'true' || github.ref_name == 'main'
       run: ct install --target-branch ${{ github.event.repository.default_branch }} --chart-dirs charts

.github/workflows/publish.yaml

@@ -7,13 +7,13 @@ on:
       - main
       - beta
     paths:
+      - '.github/workflows/**'
       - pyproject.toml
       - Dockerfile
       - '*.py'
       - tests/**
       - tools/**
       - utils/**
-  workflow_dispatch:
 
 concurrency:
   group: 'publish-${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
@@ -100,7 +100,7 @@ jobs:
           TAG_CONTEXT: 'repo'
           WITH_V: true
           PRERELEASE_SUFFIX: "beta"
-          PRERELEASE: ${{ (github.base_ref == 'beta') && 'true' || (github.base_ref == 'main') && 'false' || (github.base_ref == 'integration') && 'false' || 'true' }}
+          PRERELEASE: ${{ (github.base_ref || github.ref_name == 'beta') && 'true' || ((github.base_ref || github.ref_name == 'main') && 'false' || 'true') }}
 
       - name: Summary
         run: |

.github/workflows/test.yaml

@@ -65,6 +65,13 @@ jobs:
           TAG=v$(grep 'version =' pyproject.toml | sed -e 's/version = "\(.*\)"/\1/')
           echo "TAG=$TAG" >> "$GITHUB_OUTPUT"
 
+      - name: Get branch ref name
+        id: branch_ref
+        run: |
+          BRANCH_NAME=${{ github.base_ref || github.ref_name }}
+          echo "$BRANCH_NAME"
+          echo "BRANCH_NAME=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
+
       - name: Get tag version
         id: semantic_release
         uses: anothrNick/[email protected]
@@ -74,7 +81,7 @@ jobs:
           TAG_CONTEXT: 'repo'
           WITH_V: true
           PRERELEASE_SUFFIX: "beta"
-          PRERELEASE: ${{ (github.base_ref == 'beta') && 'true' || (github.base_ref == 'main') && 'false' || (github.base_ref == 'integration') && 'false' || 'true' }}
+          PRERELEASE: ${{ (github.base_ref || github.ref_name == 'beta') && 'true' || (((github.base_ref || github.ref_name == 'main') && 'false' || (github.base_ref || github.ref_name == 'integration') && 'false') || 'true') }}
           DRY_RUN: true
 
       - name: Compare versions

README.md

@@ -1,5 +1,11 @@
 # MCP Server
 
+| App Test | Helm Test |
+|------|---------|
+| [![App Test](https://github.com/sysdiglabs/sysdig-mcp-server/actions/workflows/publish.yaml/badge.svg?branch=main)](https://github.com/sysdiglabs/sysdig-mcp-server/actions/workflows/publish.yaml) | [![Helm Test](https://github.com/sysdiglabs/sysdig-mcp-server/actions/workflows/helm_test.yaml/badge.svg?branch=main)](https://github.com/sysdiglabs/sysdig-mcp-server/actions/workflows/helm_test.yaml) |
+
+---
+
 ## Table of contents
 
 - [MCP Server](#mcp-server)