public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v9.5.x] CI: Update CI/CD tooling and pipelines from main (#76875)

Browse Source 
* CI: Update CI/CD tooling and pipelines from main (#76814)

* CI: Update CI/CD tooling and pipelines from main

* Update Makefile

* Comment out validate_openapi_spec_step

* Update broken frontend tests

* Fix validate-npm-packages regex to work without suffix

* Fix cypress image version

(cherry picked from commit 03ecb1db39)

* Comment out kindsysreport/codegen/report.go on Makefile

* Disable steps that don't work for older versions

* Fix permissions of validate-npm-packages.sh
This commit is contained in:
Guilherme Caulada
2023-10-20 10:26:39 -03:00
committed by GitHub
parent 0b55a53a47
commit 9598e8783b
49 changed files with 3000 additions and 2883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/build/git.go
+13
View File
@@ -15,3 +15,16 @@ func getGitSha() string {
}
return string(v)
}
func getGitEnterpriseSha() string {
// supporting the old way of dev setup
v, err := runError("git", "-C", "../grafana-enterprise", "rev-parse", "--short", "HEAD")
if err != nil {
// supporting the new way of dev setup
v, err = runError("git", "-C", "..", "rev-parse", "--short", "HEAD")
if err != nil {
return ""
}
}
return string(v)
}