From edc36d3948d6e3fd4df0c5ddf594cfd3b2a1fdf1 Mon Sep 17 00:00:00 2001 From: Kevin Minehart Date: Tue, 26 Sep 2023 12:09:18 -0500 Subject: [PATCH] CI: check /tmp/grafana-enterprise; don't fail if rev-parse fails (#75480) check /tmp/grafana-enterprise; don't fail if rev-parse fails --- pkg/build/config/revision.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/build/config/revision.go b/pkg/build/config/revision.go index b4f52103c9b..70be21cdf18 100644 --- a/pkg/build/config/revision.go +++ b/pkg/build/config/revision.go @@ -3,6 +3,7 @@ package config import ( "context" "fmt" + "log" "strconv" "time" @@ -47,7 +48,10 @@ func GrafanaRevision(ctx context.Context, grafanaDir string) (Revision, error) { if err != nil { enterpriseCommit, err = executil.OutputAt(ctx, grafanaDir, "git", "-C", "..", "rev-parse", "--short", "HEAD") if err != nil { - return Revision{}, err + enterpriseCommit, err = executil.OutputAt(ctx, grafanaDir, "git", "-C", "/tmp/grafana-enterprise", "rev-parse", "--short", "HEAD") + if err != nil { + log.Println("Could not get enterprise commit. Error:", err) + } } }