Tarballs: Check if version contains build ID (#187)

grafana · Sep 28, 2023 · 71af960 · 71af960
1 parent 0cc07ff
commit 71af960
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/containers/opts_grafana.go b/containers/opts_grafana.go
@@ -126,7 +126,7 @@ func (g *GrafanaOpts) DetectVersion(ctx context.Context, client *dagger.Client,
 		return "", err
 	}
 
-	v = strings.ReplaceAll(v, "pre", "")
+	v = strings.ReplaceAll(v, "pre", g.BuildID)
 
 	log.Println("Got version", v)
 	return v, nil

diff --git a/pipelines/package_names.go b/pipelines/package_names.go
@@ -51,7 +51,12 @@ func TarFilename(opts TarFileOpts) string {
 		arch = strings.Join([]string{arch, archv}, "-")
 	}
 
-	p := []string{name, opts.Version, opts.BuildID, os, arch}
+	var p []string
+	if strings.Contains(opts.Version, opts.BuildID) {
+		p = []string{name, opts.Version, os, arch}
+	} else {
+		p = []string{name, opts.Version, opts.BuildID, os, arch}
+	}
 
 	return fmt.Sprintf("%s.tar.gz", strings.Join(p, "_"))
 }