X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/060dc61639b8a5ac4458bc21d1120b3ad508b0a3..40e378c88c2ae8e90b0785f3983ca320827e4cdf:/cmd/arvados-package/build.go 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)