From a909c838b543a7a4a73d8b4bbffa451d76f3862b Mon Sep 17 00:00:00 2001
From: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
Date: Tue, 23 Sep 2025 14:22:39 -0500
Subject: [PATCH] [release-12.0.5] sync packaging w/ main (#111495)

sync packaging w/ main
---
 .github/workflows/release-build.yml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index ff65d90cf5b..650ba6a67c1 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -271,21 +271,30 @@ jobs:
           docker manifest push "grafana/grafana-dev:${VERSION}"
           docker manifest push "grafana/grafana-dev:${VERSION}-ubuntu"
 
-  publish-npm-canaries:
+  dispatch-npm-canaries:
     if: github.ref_name == 'main'
-    name: Publish NPM canaries
-    uses: ./.github/workflows/release-npm.yml
+    name: Dispatch publish NPM canaries
     permissions:
+      actions: write
       contents: read
-      id-token: write
+    runs-on: ubuntu-x64-small
     needs:
       - setup
-      - build
-    with:
-      grafana_commit: ${{ needs.setup.outputs.grafana-commit }}
-      version: ${{ needs.setup.outputs.version }}
-      build_id: ${{ github.run_id }}
-      version_type: "canary"
+    steps:
+      - name: Dispatch action
+        env:
+          GRAFANA_COMMIT: ${{ needs.setup.outputs.grafana-commit }}
+          VERSION: ${{ needs.setup.outputs.version }}
+          BUILD_ID: ${{ github.run_id }}
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh workflow run release-npm.yml \
+            --repo grafana/grafana \
+            --ref main \
+            --field grafana_commit="$GRAFANA_COMMIT" \
+            --field version="$VERSION" \
+            --field build_id="$BUILD_ID"\
+            --field version_type="canary"
 
   # notify-pr creates (or updates) a comment in a pull request to link to this workflow where the release artifacts are
   # being built.