From 7d205c7deeffdcb15eff9ea2d9bc6f3d088d3dd9 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 18 Sep 2025 23:16:26 +0100
Subject: [PATCH] [release-12.2.1] CI: Fix NPM workflow inputs (#111350)

Fix referring to inputs (#111345)

(cherry picked from commit 1d6c1da94f34266b7477af1bd9fc05b4c237caf4)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
---
 .github/workflows/release-npm.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
index 02bedc93965..ff0af784232 100644
--- a/.github/workflows/release-npm.yml
+++ b/.github/workflows/release-npm.yml
@@ -51,6 +51,7 @@ jobs:
       - name: Info
         env:
           GITHUB_REF: ${{ github.ref }}
+          GRAFANA_COMMIT: ${{ inputs.grafana_commit }}
         run: |
           echo "GRAFANA_COMMIT: $GRAFANA_COMMIT"
           echo "github.ref: $GITHUB_REF"
@@ -66,15 +67,15 @@ jobs:
       # not in the last 100 commits.
       - name: Verify commit is in workflow HEAD
         env:
-          GIT_COMMIT: ${{ github.event.inputs.grafana_commit }}
+          GIT_COMMIT: ${{ inputs.grafana_commit }}
         run: ./.github/workflows/scripts/validate-commit-in-head.sh
         shell: bash
 
       - name: Map version type to NPM tag
         id: npm-tag
         env:
-          VERSION: ${{ github.event.inputs.version }}
-          VERSION_TYPE: ${{ github.event.inputs.version_type }}
+          VERSION: ${{ inputs.version }}
+          VERSION_TYPE: ${{ inputs.version_type }}
           REFERENCE_PKG: "@grafana/runtime"
         run: |
           TAG=$(./.github/workflows/scripts/determine-npm-tag.sh)
@@ -85,7 +86,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-          ref: ${{ github.event.inputs.grafana_commit }}
+          ref: ${{ inputs.grafana_commit }}
 
       - name: Setup Node
         uses: ./.github/actions/setup-node
@@ -102,7 +103,7 @@ jobs:
 
       - name: Version, build, and pack packages
         env:
-          VERSION: ${{ github.event.inputs.version }}
+          VERSION: ${{ inputs.version }}
         run: |
           yarn run packages:build
           yarn lerna version "$VERSION" \