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

[release-1.6] Tag 1.6.2 #1613

Merged
merged 2 commits into from
Apr 1, 2022
Merged

[release-1.6] Tag 1.6.2 #1613

merged 2 commits into from
Apr 1, 2022

Conversation

mtrmac
Copy link
Contributor

@mtrmac mtrmac commented Mar 31, 2022

No description provided.

- Bump github.com/prometheus/client_golang to v1.11.1
- Update the command to install golint

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 31, 2022

@lsm5 @jnovy FYI. (The release should be tagged in the middle of this PR.)

@mtrmac mtrmac changed the title Tag 1.6.2 [release-1.6] Tag 1.6.2 Mar 31, 2022
Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

I think the release branch itself with the backported commit would suffice for @jnovy's needs. But, I'm cool either way. LGTM.

@rhatdan
Copy link
Member

rhatdan commented Mar 31, 2022

I did not think we did -dev tags in released branches?

@jnovy
Copy link
Contributor

jnovy commented Mar 31, 2022

good catch @rhatdan ! Yes please, no -dev in version for maintenance branches @mtrmac

@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 31, 2022

It’s quite possible, in that case I’m just unaware of that convention. In the Skopeo context, historical practice varies.

(I think some marker to make sure the 1.6.2 release is unambiguous, even if we latter use the branch, is valuable. I don’t care about the particular name, if -dev is perceived to imply there is active development going on on that branch; it could be -unreleased or -release-branch or whatever.)

@mtrmac
Copy link
Contributor Author

mtrmac commented Mar 31, 2022

@jnovy After this PR, there would be a version v1.6.2 tagged either way.

This would only affect about the version reported in any future cherry-pick, if it happened without tagging a post-v1.6.2 release. From the upstream perspective, it is valuable to be able to differentiate the “real” v1.6.2 from a cherry-pick of a different tree.

@jnovy
Copy link
Contributor

jnovy commented Mar 31, 2022

@mtrmac "-maint" could do if you prefer a tag to be added to the maintenance branch IMO.

@rhatdan
Copy link
Member

rhatdan commented Apr 1, 2022

I think it is fine to leave it, but we almost always do a back port and cut a release. We don't have long lasting changes to a release branch.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Copy link
Contributor Author

mtrmac commented Apr 1, 2022

Updated the post-release version to 1.6.2-maint.

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

LGTM

@mtrmac
Copy link
Contributor Author

mtrmac commented Apr 1, 2022

Merging so that this doesn’t block packaging work; we can adjust the post-release name later.

@mtrmac mtrmac merged commit 540efb3 into containers:release-1.6 Apr 1, 2022
@mtrmac mtrmac deleted the tag-1.6.2 branch April 1, 2022 18:20
@mtrmac
Copy link
Contributor Author

mtrmac commented Apr 1, 2022

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants