From 2776c750a36a957ef16e92ab75a03d2831b5ee78 Mon Sep 17 00:00:00 2001 From: Matthieu Vachon Date: Thu, 3 Apr 2025 16:54:00 -0400 Subject: [PATCH] Adjusted CI to allow to build on all `release/` branches --- build/ci.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci.go b/build/ci.go index ff5e8e980f..80b9941130 100644 --- a/build/ci.go +++ b/build/ci.go @@ -675,7 +675,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) } @@ -719,7 +719,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}