[v10.0.x] CI: Update CI/CD tooling and pipelines from main (#76874)
* 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
* Remove modfile step, since modowners doesn't exist
* Disable i18n step
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user