fix: sun

Signed-off-by: suwhang-cisco <suwhang@cisco.com>

Author: suwhang-cisco

.github/workflows/helm-pre-release.yml

@@ -1,15 +1,19 @@
 name: "[Pre-Release] Helm Chart"
 description: "Publish pre-release Helm charts"
 
-# Triggered when [CI][Helm] Auto-bump Chart Versions workflow completes
 on:
-  workflow_run:
-    workflows: ["[CI][Helm] Auto-bump Chart Versions"]
-    types:
-      - completed
-    branches:
-      - main
-      - 'prebuild/**'
+  # Called directly from helm-rc-version-bump workflow
+  workflow_call:
+    inputs:
+      pr_number:
+        description: 'PR number to publish pre-release for'
+        required: true
+        type: number
+      new_commit:
+        description: 'Whether a new commit was made by version bump'
+        required: false
+        type: boolean
+        default: false
 
 permissions:
   contents: read
@@ -21,47 +25,18 @@ jobs:
   publish-pre-release:
     name: Publish Pre-release Helm Chart
     runs-on: ubuntu-latest
-    # Only run if the triggering workflow succeeded
-    if: github.event.workflow_run.conclusion == 'success'
+    # Skip if a new commit was made (will re-run on next trigger)
+    if: ${{ !inputs.new_commit }}
 
     steps:
-      - name: 📥 Download version bump status artifact
-        uses: actions/download-artifact@v7
-        with:
-          name: version-bump-status
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: 📋 Read version bump status
+      - name: 📋 Set PR info from inputs
         id: bump-status
         run: |
-          if [[ -f "version-bump-status.txt" ]]; then
-            echo "📋 Version bump status:"
-            cat version-bump-status.txt
-
-            # Parse the status file
-            NEW_COMMIT=$(grep "^new_commit=" version-bump-status.txt | cut -d'=' -f2)
-            PR_NUMBER=$(grep "^pr_number=" version-bump-status.txt | cut -d'=' -f2)
-            HEAD_SHA=$(grep "^head_sha=" version-bump-status.txt | cut -d'=' -f2)
-
-            echo "new_commit=$NEW_COMMIT" >> $GITHUB_OUTPUT
-            echo "pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
-            echo "head_sha=$HEAD_SHA" >> $GITHUB_OUTPUT
-
-            if [[ "$NEW_COMMIT" == "true" ]]; then
-              echo "🔄 Version bump workflow made a new commit - skipping pre-release"
-              echo "skip=true" >> $GITHUB_OUTPUT
-            else
-              echo "✅ No new commit from version bump - proceeding with pre-release"
-              echo "skip=false" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "⚠️ No version bump status file found"
-            echo "skip=false" >> $GITHUB_OUTPUT
-          fi
+          echo "pr_number=${{ inputs.pr_number }}" >> $GITHUB_OUTPUT
+          echo "skip=false" >> $GITHUB_OUTPUT
+          echo "📋 Processing PR #${{ inputs.pr_number }}"
 
       - name: 🔍 Get PR details
-        if: steps.bump-status.outputs.skip != 'true'
         id: pr-info
         uses: actions/github-script@v8
         with:
@@ -88,49 +63,13 @@ jobs:
             console.log(`Head SHA: ${pr.head.sha}`);
             console.log(`Labels: ${pr.labels.map(l => l.name).join(', ')}`);
 
-      - name: 🔍 Check if pre-release should run
-        if: steps.bump-status.outputs.skip != 'true'
-        id: should-run
-        run: |
-          HEAD_REF="${{ steps.pr-info.outputs.head_ref }}"
-          HEAD_REPO="${{ steps.pr-info.outputs.head_repo_full_name }}"
-          LABELS="${{ steps.pr-info.outputs.labels }}"
-          REPO="${{ github.repository }}"
-
-          echo "🔍 Checking pre-release conditions..."
-          echo "  Branch: $HEAD_REF"
-          echo "  Repo: $HEAD_REPO"
-          echo "  Labels: $LABELS"
-
-          SHOULD_RUN=false
-
-          # Check for prebuild/ branch from same repo
-          if [[ "$HEAD_REPO" == "$REPO" && "$HEAD_REF" == prebuild/* ]]; then
-            echo "✅ Matched: prebuild/ branch from same repo"
-            SHOULD_RUN=true
-          fi
-
-          # Check for helm-prerelease label
-          if [[ "$LABELS" == *"helm-prerelease"* ]]; then
-            echo "✅ Matched: helm-prerelease label"
-            SHOULD_RUN=true
-          fi
-
-          echo "should_run=$SHOULD_RUN" >> $GITHUB_OUTPUT
-
-          if [[ "$SHOULD_RUN" != "true" ]]; then
-            echo "ℹ️ Skipping pre-release - conditions not met"
-          fi
-
       - name: 📥 Checkout repository
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true'
         uses: actions/checkout@v6
         with:
           ref: ${{ steps.pr-info.outputs.head_sha }}
           fetch-depth: 0
 
       - name: 🔍 Check if chart versions are bumped
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true'
         id: version-check
         run: |
           git fetch origin main
@@ -185,18 +124,18 @@ jobs:
           fi
 
       - name: ⚙️ Set up Helm
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true'
+        if: steps.version-check.outputs.skip != 'true'
         uses: azure/setup-helm@v4
         with:
           version: v3.14.0
 
       - name: 🔐 Login to GHCR
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true'
+        if: steps.version-check.outputs.skip != 'true'
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: 🔍 Detect Changed Charts
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true'
+        if: steps.version-check.outputs.skip != 'true'
         id: detect
         run: |
           # Detect which charts have changes (excluding Chart.lock only changes)
@@ -236,7 +175,7 @@ jobs:
           echo "ai-platform-changed=$AI_PLATFORM_CHANGED" >> $GITHUB_OUTPUT
 
       - name: 🏷️ Generate Pre-release Versions
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true'
+        if: steps.version-check.outputs.skip != 'true'
         id: version
         run: |
           # Get branch name and remove 'prebuild/' prefix if present
@@ -284,7 +223,7 @@ jobs:
           fi
 
       - name: 📦 Package rag-stack Chart
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true' && steps.detect.outputs.rag-stack-changed == 'true'
+        if: steps.version-check.outputs.skip != 'true' && steps.detect.outputs.rag-stack-changed == 'true'
         run: |
           echo "📦 Packaging rag-stack..."
 
@@ -300,7 +239,7 @@ jobs:
           echo "✅ rag-stack packaged successfully"
 
       - name: 📦 Package ai-platform-engineering Chart
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true' && steps.detect.outputs.ai-platform-changed == 'true'
+        if: steps.version-check.outputs.skip != 'true' && steps.detect.outputs.ai-platform-changed == 'true'
         run: |
           echo "📦 Packaging ai-platform-engineering..."
 
@@ -345,7 +284,7 @@ jobs:
           echo "✅ ai-platform-engineering packaged successfully with all dependencies"
 
       - name: 🚀 Push Pre-release Charts to GHCR
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true'
+        if: steps.version-check.outputs.skip != 'true'
         run: |
           REGISTRY="oci://ghcr.io/${{ github.repository_owner }}/pre-release-helm-charts"
 
@@ -363,7 +302,7 @@ jobs:
           done
 
       - name: 💬 Comment on PR
-        if: steps.bump-status.outputs.skip != 'true' && steps.should-run.outputs.should_run == 'true' && steps.version-check.outputs.skip != 'true'
+        if: steps.version-check.outputs.skip != 'true'
         uses: actions/github-script@v8
         with:
           script: |

.github/workflows/helm-rc-version-bump.yml

@@ -14,14 +14,19 @@ on:
 
 permissions:
   contents: write
-  pull-requests: read
+  pull-requests: write
+  packages: write
+  actions: read
 
 jobs:
   auto-bump-versions:
     name: Auto-bump Chart Versions
     runs-on: ubuntu-latest
     # Don't run on commits made by this workflow (avoid infinite loop)
     if: github.actor != 'github-actions[bot]'
+    outputs:
+      new_commit: ${{ steps.status.outputs.new_commit }}
+      should_prerelease: ${{ steps.prerelease-check.outputs.should_run }}
     steps:
       - name: 📥 Checkout repository
         uses: actions/checkout@v6.0.1
@@ -424,21 +429,59 @@ jobs:
           # Determine if a new commit was made
           if [[ "${{ steps.commit.outputs.committed }}" == "true" ]]; then
             echo "new_commit=true" >> $GITHUB_OUTPUT
-            echo "🔄 New commit was made - downstream workflows should skip"
+            echo "🔄 New commit was made - pre-release will run on next trigger"
           else
             echo "new_commit=false" >> $GITHUB_OUTPUT
-            echo "✅ No new commit - downstream workflows can proceed"
+            echo "✅ No new commit - pre-release can proceed"
           fi
 
-          # Write status file for artifact
-          mkdir -p ${{ runner.temp }}/status
-          echo "new_commit=${{ steps.commit.outputs.committed == 'true' && 'true' || 'false' }}" > "${{ runner.temp }}/status/version-bump-status.txt"
-          echo "pr_number=${{ github.event.pull_request.number }}" >> "${{ runner.temp }}/status/version-bump-status.txt"
-          echo "head_sha=${{ github.event.pull_request.head.sha }}" >> "${{ runner.temp }}/status/version-bump-status.txt"
+      - name: 🔍 Check if pre-release should run
+        id: prerelease-check
+        if: github.event_name == 'pull_request'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          HEAD_REF="${{ github.head_ref }}"
+          REPO="${{ github.repository }}"
+          PR_NUMBER="${{ github.event.pull_request.number }}"
 
-      - name: 📦 Save commit status artifact
-        uses: actions/upload-artifact@v6
-        with:
-          name: version-bump-status
-          path: ${{ runner.temp }}/status/version-bump-status.txt
-          retention-days: 1
+          echo "🔍 Checking pre-release conditions..."
+          echo "  Branch: $HEAD_REF"
+          echo "  PR: #$PR_NUMBER"
+
+          SHOULD_RUN=false
+
+          # Check for prebuild/ branch
+          if [[ "$HEAD_REF" == prebuild/* ]]; then
+            echo "✅ Matched: prebuild/ branch"
+            SHOULD_RUN=true
+          fi
+
+          # Check for helm-prerelease label
+          LABELS=$(gh pr view "$PR_NUMBER" --json labels --jq '.labels[].name' 2>/dev/null | tr '\n' ',' || echo "")
+          echo "  Labels: $LABELS"
+
+          if [[ "$LABELS" == *"helm-prerelease"* ]]; then
+            echo "✅ Matched: helm-prerelease label"
+            SHOULD_RUN=true
+          fi
+
+          echo "should_run=$SHOULD_RUN" >> $GITHUB_OUTPUT
+
+          if [[ "$SHOULD_RUN" != "true" ]]; then
+            echo "ℹ️ Skipping pre-release - conditions not met (need prebuild/ branch or helm-prerelease label)"
+          fi
+
+  # Call pre-release workflow for PRs on prebuild/ branches or with helm-prerelease label
+  helm-pre-release:
+    name: Publish Pre-release Helm Charts
+    needs: auto-bump-versions
+    if: |
+      github.event_name == 'pull_request' &&
+      needs.auto-bump-versions.outputs.should_prerelease == 'true' &&
+      needs.auto-bump-versions.outputs.new_commit != 'true'
+    uses: ./.github/workflows/helm-pre-release.yml
+    with:
+      pr_number: ${{ github.event.pull_request.number }}
+      new_commit: ${{ needs.auto-bump-versions.outputs.new_commit == 'true' }}
+    secrets: inherit