lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release/dist/cli: correctly handle absolute build outputs in manifest 

Some builders return absolute paths to build products already. When that
happens, the manifest writing logic shouldn't tack on another absolute
prefix.

Signed-off-by: David Anderson <danderson@tailscale.com>
pull/8168/merge
David Anderson 2023-05-25 19:26:11 -07:00 committed by Dave Anderson
parent c4fe9c536d
commit c0b4a54146
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/dist/cli/cli.go vendored
View File

@ -124,10 +124,11 @@ func runBuild(ctx context.Context, filters []string, targets []dist.Target) erro
if err != nil { if err != nil {
return fmt.Errorf("getting absolute path of manifest: %w", err) return fmt.Errorf("getting absolute path of manifest: %w", err)
} }
fmt.Println(manifest)
fmt.Println(filepath.Join(b.Out, out[0]))
for i := range out { for i := range out {
rel, err := filepath.Rel(filepath.Dir(manifest), filepath.Join(b.Out, out[i])) if !filepath.IsAbs(out[i]) {
out[i] = filepath.Join(b.Out, out[i])
}
rel, err := filepath.Rel(filepath.Dir(manifest), out[i])
if err != nil { if err != nil {
return fmt.Errorf("making path relative: %w", err) return fmt.Errorf("making path relative: %w", err)
} }