From 956556437d94de46f99aeb08aa126b00c3e94a8c Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 15 Mar 2022 11:24:52 -0400 Subject: [PATCH] 18700: Default to version-at-commit.sh instead of git-describe. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-package/build.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go index 8268ea9bac..27531d3bc3 100644 --- a/cmd/arvados-package/build.go +++ b/cmd/arvados-package/build.go @@ -24,13 +24,13 @@ import ( func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writer) error { if opts.PackageVersion == "" { var buf bytes.Buffer - cmd := exec.CommandContext(ctx, "git", "describe", "--tag", "--dirty") + cmd := exec.CommandContext(ctx, "bash", "./build/version-at-commit.sh", "HEAD") cmd.Stdout = &buf cmd.Stderr = stderr cmd.Dir = opts.SourceDir err := cmd.Run() if err != nil { - return fmt.Errorf("git describe: %w", err) + return fmt.Errorf("%v: %w", cmd.Args, err) } opts.PackageVersion = strings.TrimSpace(buf.String()) ctxlog.FromContext(ctx).Infof("version not specified; using %s", opts.PackageVersion) -- 2.30.2