mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 15:16:43 +00:00
Merge branch 'firehose-fh3.0' into release/geth-1.x-fh3.0
This commit is contained in:
commit
9b3b69f31f
2 changed files with 2 additions and 2 deletions
|
|
@ -661,7 +661,7 @@ func maybeSkipArchive(env build.Environment) {
|
|||
log.Printf("skipping archive creation because this is a PR build")
|
||||
os.Exit(0)
|
||||
}
|
||||
if env.Branch != "master" && !strings.HasPrefix(env.Branch, "firehose") && !strings.HasPrefix(env.Tag, "v1.") && !strings.Contains(env.Tag, "fh") {
|
||||
if env.Branch != "master" && !strings.HasPrefix(env.Branch, "firehose") && !strings.HasPrefix(env.Branch, "release/") && !strings.HasPrefix(env.Tag, "v1.") && !strings.Contains(env.Tag, "fh") {
|
||||
log.Printf("skipping archive creation because branch %q, tag %q is not on the inclusion list", env.Branch, env.Tag)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
|
@ -705,7 +705,7 @@ func doDockerBuildx(cmdline []string) {
|
|||
tags = []string{"latest"}
|
||||
case strings.HasPrefix(env.Tag, "v1."):
|
||||
tags = []string{"stable", fmt.Sprintf("release-%v", version.Family), "v" + version.Semantic}
|
||||
case strings.HasPrefix(env.Branch, "firehose"):
|
||||
case strings.HasPrefix(env.Branch, "firehose") || strings.HasPrefix(env.Branch, "release/"):
|
||||
tags = []string{"edge-fh" + tracers.FirehoseProtocolVersion}
|
||||
case strings.Contains(env.Tag, "fh"):
|
||||
tags = []string{"stable-fh" + tracers.FirehoseProtocolVersion, "v" + version.Semantic + "-fh" + tracers.FirehoseProtocolVersion}
|
||||
|
|
|
|||
Loading…
Reference in a new issue