Skip to content

Always store git sha in _version.py during installation - #59137

Merged
dwoz merged 5 commits into
saltstack:masterfrom
bryceml:always_store_git_sha
Jan 25, 2021
Merged

Always store git sha in _version.py during installation#59137
dwoz merged 5 commits into
saltstack:masterfrom
bryceml:always_store_git_sha

Conversation

@bryceml

@bryceml bryceml commented Dec 14, 2020

Copy link
Copy Markdown
Contributor

What does this PR do?

It always puts the git sha in salt/_version.py when it's generating it's version automatically.

The main difference that tagged versions will include the git sha in that file so it can be figured out later what exact sha is being run, I don't think there should be any other changes anywhere.

What issues does this PR fix or reference?

Previous Behavior

tagged versions did not store the git sha

New Behavior

tagged versions also store the git sha

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

@bryceml
bryceml force-pushed the always_store_git_sha branch from f8b39ba to 4b1ba6e Compare December 14, 2020 19:53
@bryceml
bryceml force-pushed the always_store_git_sha branch from 4b1ba6e to 6beea2b Compare December 14, 2020 19:58
@bryceml
bryceml requested a review from s0undt3ch December 14, 2020 21:26
@bryceml
bryceml marked this pull request as ready for review December 14, 2020 21:26
@bryceml
bryceml requested a review from a team as a code owner December 14, 2020 21:26
@bryceml bryceml added the Aluminium Release Post Mg and Pre Si label Dec 15, 2020
@bryceml bryceml added this to the Aluminium milestone Dec 15, 2020

@Ch3LL Ch3LL left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What's the use case where you would need the sha? I would assume when you tag a version you only want the tag version not the sha included

@bryceml

bryceml commented Dec 16, 2020

Copy link
Copy Markdown
Contributor Author

It doesn't show up graphically anywhere, or in any output. It's mainly so when we do the nightly builds, you can track down the exact sha it came from.

For the non-tiamat packages, you can't have a - in the version in the egg info of the python package or rpmbuild errors out. So I'm doing what we've done in the past with something like 3002.2nb[some number]

@dwoz
dwoz merged commit 7e357ae into saltstack:master Jan 25, 2021
@bryceml
bryceml deleted the always_store_git_sha branch January 25, 2021 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Aluminium Release Post Mg and Pre Si

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants