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

Feature/version dot zero #62742

Merged
merged 6 commits into from
Sep 28, 2022
Merged

Conversation

MKLeb
Copy link
Contributor

@MKLeb MKLeb commented Sep 23, 2022

What does this PR do?

Adds the .0 back to our versioning scheme. Now, our newer major releases have minor data, but that data is 0.

NOTE: In order to have this change happen, we now need to tag future releases like 3006 as 3006.0, since most of the logic is done with git describe

What issues does this PR fix or reference?

Fixes: #60772

Previous Behavior

Our major releases did not have a .0 appendned to their version.

New Behavior

Our next major release, for example, should have version 3006.0

Merge requirements satisfied?

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

Commits signed with GPG?

Yes

@MKLeb MKLeb requested a review from a team as a code owner September 23, 2022 15:46
@MKLeb MKLeb requested review from Ch3LL and removed request for a team September 23, 2022 15:46
@Ch3LL Ch3LL added the Sulfur v3006.0 release code name and version label Sep 27, 2022
@Ch3LL Ch3LL requested a review from s0undt3ch September 27, 2022 18:57
@MKLeb MKLeb requested a review from dwoz September 27, 2022 19:30
@@ -54,6 +54,10 @@
(3000, 2, "nb", 20201214010203, 0, "1e7bc8f"),
"3000.2nb20201214010203",
),
("v3006.0", (3006, 0, "", 0, 0, None), "3006.0"),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
("v3006.0", (3006, 0, "", 0, 0, None), "3006.0"),
("v3006.0", (3006, 0, "", 0, 0, None), "3006"),
("v3006.0", (3006, 0, "", 0, 0, None), "3006.0"),

Maybe also try to see if it handles bad tags?

@Ch3LL Ch3LL merged commit 8b79834 into saltstack:master Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sulfur v3006.0 release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE REQUEST] Re-adding point zero to major salt versions (ex. 3006.0)
5 participants