fix: Updating GH concurrency error and updating helm chart

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

Author: S3B4SZ17

.github/workflows/helm_test.yaml

@@ -5,24 +5,20 @@ on:
   pull_request:
     branches:
       - main
-      - develop
-      - feature/**
-      - release/**
-      - hotfix/**
+      - beta
     paths:
     - 'charts/**'
   push:
     branches:
       - main
-      - develop
-      - feature/**
-      - release/**
-      - hotfix/**
+      - beta
     paths:
     - 'charts/**'
+  workflow_call:
+  workflow_dispatch:
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: 'helm-test-${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 
 jobs:

.github/workflows/publish.yaml

@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: 'publish-${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 
 jobs:
@@ -100,10 +100,19 @@ jobs:
           TAG_CONTEXT: 'repo'
           WITH_V: true
           PRERELEASE_SUFFIX: "beta"
-          PRERELEASE: ${{ (github.base_ref != 'main') && 'true' || 'false' }}
+          PRERELEASE: ${{ (github.base_ref == 'beta') && 'true' || (github.base_ref == 'main') && 'false' || (github.base_ref == 'integration') && 'false' || 'true' }}
 
       - name: Summary
         run: |
           echo "## Release 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
+
+  test_helm_chart:
+    name: Test Helm Chart
+    needs: push_to_registry
+    permissions:
+      contents: read # required for actions/checkout
+      pull-requests: write # required for creating a PR with the chart changes
+    uses: ./.github/workflows/helm_test.yaml
+    secrets: inherit

.github/workflows/test.yaml

@@ -5,7 +5,8 @@ on:
   push:
     branches:
       - main
-      - develop
+      - beta
+      - integration
       - feature/**
       - release/**
       - hotfix/**
@@ -25,9 +26,10 @@ on:
       - tools/**
       - utils/**
   workflow_call:
+  workflow_dispatch:
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: 'tests-${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 
 jobs:
@@ -59,8 +61,8 @@ jobs:
       - name: Run Unit Tests
         run: make test
 
-  pre_release:
-    name: Tag Release
+  check_version:
+    name: Check Version
     runs-on: ubuntu-latest
     needs: test
     permissions:
@@ -87,7 +89,7 @@ jobs:
           TAG_CONTEXT: 'repo'
           WITH_V: true
           PRERELEASE_SUFFIX: "beta"
-          PRERELEASE: ${{ (github.base_ref != 'main') && 'true' || 'false' }}
+          PRERELEASE: ${{ (github.base_ref == 'beta') && 'true' || (github.base_ref == 'main') && 'false' || (github.base_ref == 'integration') && 'false' || 'true' }}
           DRY_RUN: true
 
       - name: Compare versions

charts/sysdig-mcp/Chart.yaml

@@ -20,10 +20,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.1"
+appVersion: "v0.1.2"

charts/sysdig-mcp/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/sysdiglabs/sysdig-mcp-server
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v0.1.1-e789d6e"
+  tag: "v0.1.2-beta.0-3d30346"
 
 imagePullSecrets: []
 nameOverride: ""