Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ark version changes #1124

Merged
merged 3 commits into from
Dec 19, 2018
Merged

ark version changes #1124

merged 3 commits into from
Dec 19, 2018

Conversation

skriss
Copy link
Contributor

@skriss skriss commented Dec 7, 2018

Fixes #1111

  • removes Git tree state line
  • uses full git SHA in Git commit line, with a -dirty suffix if git tree state is dirty

@skriss skriss requested review from carlisia, ncdc and nrb December 7, 2018 16:49
Signed-off-by: Steve Kriss <steve@heptio.com>
Signed-off-by: Steve Kriss <steve@heptio.com>
Signed-off-by: Steve Kriss <steve@heptio.com>
@skriss skriss changed the title Ark version changes ark version changes Dec 7, 2018
Copy link
Contributor

@nrb nrb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks correct to me!

@@ -39,16 +39,14 @@ builds:
- goos: windows
goarch: arm64
ldflags:
- -X "github.com/heptio/ark/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/heptio/ark/pkg/buildinfo.GitSHA={{ .Env.GIT_SHA }}" -X "github.com/heptio/ark/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}"
- -X "github.com/heptio/ark/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/heptio/ark/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/heptio/ark/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line still has GitTreeState?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're still showing it, just not as a separate line

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nvm, I saw the removal of it below but didn't pay attention that it was from the bug command file.

@ncdc
Copy link
Contributor

ncdc commented Dec 19, 2018

LGTM

@ncdc ncdc merged commit 2ed241b into vmware-tanzu:master Dec 19, 2018
@skriss skriss deleted the ark-version-changes branch January 2, 2019 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Simplify what's shown in ark version
3 participants