From 947818fb008ca7617b93e278b40487d1b0427fba Mon Sep 17 00:00:00 2001
From: Horst Gutmann <horst.gutmann@grafana.com>
Date: Fri, 27 Oct 2023 09:38:13 +0200
Subject: [PATCH] [v10.2.x] CI: Fix release-npm-packages action (#77255)

CI: Fix release-npm-packages action (#77127)

* Remove dependency of NpmReleaseAction to the git binary

* Switch to using the node image for the release-npm-packages step

(cherry picked from commit aa9fc3be7299710334759125d0532f3c6818c467)
---
 .drone.yml                        | 4 ++--
 pkg/build/cmd/npm.go              | 7 -------
 scripts/drone/events/release.star | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index bff4ed80f72..1ccc926f3e7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2674,7 +2674,7 @@ steps:
     NPM_TOKEN:
       from_secret: npm_token
   failure: ignore
-  image: golang:1.20.10-alpine
+  image: node:18.12.0-alpine
   name: release-npm-packages
 trigger:
   event:
@@ -4630,6 +4630,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 29471197ded2a5d5b594ebce0eb2a9c51250f3ee37aafee6ea395cda1fa6269a
+hmac: 1e843ec48dc89c92072df778c9ac4cb63bf0578f2005d4791624111a8a506c28
 
 ...
diff --git a/pkg/build/cmd/npm.go b/pkg/build/cmd/npm.go
index 13994fb4e19..ba35679f57a 100644
--- a/pkg/build/cmd/npm.go
+++ b/pkg/build/cmd/npm.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 
 	"github.com/urfave/cli/v2"
@@ -74,12 +73,6 @@ func NpmReleaseAction(c *cli.Context) error {
 		return fmt.Errorf("no tag version specified, exitting")
 	}
 
-	cmd := exec.Command("git", "checkout", ".")
-	if err := cmd.Run(); err != nil {
-		fmt.Println("command failed to run, err: ", err)
-		return err
-	}
-
 	err := npm.PublishNpmPackages(c.Context, tag)
 	if err != nil {
 		return err
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index 5e71f1eed04..cdf8c9883c0 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -62,7 +62,7 @@ def retrieve_npm_packages_step():
 def release_npm_packages_step():
     return {
         "name": "release-npm-packages",
-        "image": images["go"],
+        "image": images["node"],
         "depends_on": [
             "compile-build-cmd",
             "retrieve-npm-packages",