_scripts/make: do not exit if git SHA ID can not be retrieved (#2973)
Something changed in TeamCity's infrastructure that makes 'git rev-parse HEAD' fail systematically on most configurations. Since the SHA ID isn't necessary anyway, print an error and continue.
This commit is contained in:
parent
3138157826
commit
75b4421d70
@ -294,11 +294,13 @@ func prepareMacnative() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func buildFlags() []string {
|
func buildFlags() []string {
|
||||||
|
var ldFlags string
|
||||||
buildSHA, err := getBuildSHA()
|
buildSHA, err := getBuildSHA()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(fmt.Errorf("error getting build SHA via git: %w", err))
|
log.Printf("error getting build SHA via git: %w", err)
|
||||||
|
} else {
|
||||||
|
ldFlags = "-X main.Build=" + buildSHA
|
||||||
}
|
}
|
||||||
ldFlags := "-X main.Build=" + buildSHA
|
|
||||||
if runtime.GOOS == "darwin" {
|
if runtime.GOOS == "darwin" {
|
||||||
ldFlags = "-s " + ldFlags
|
ldFlags = "-s " + ldFlags
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user