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

CHANGELOG 5.2.3 #7571

Merged

Conversation

Smjert
Copy link
Member

@Smjert Smjert commented Apr 26, 2022

NOTE: this also contains the changelog for 5.2.2 which was pushed after the 5.2.2 tag, so it wasn't contained in the 5.2.3 branch.

@Smjert Smjert added the release label Apr 26, 2022
@Smjert Smjert requested review from a team as code owners April 26, 2022 14:05
@Smjert
Copy link
Member Author

Smjert commented Apr 26, 2022

We might've to temporarily disable the readthedocs check since the 5.2.3 branch didn't have the fix for it.

@Smjert
Copy link
Member Author

Smjert commented Apr 26, 2022

Also, how were we calculating the number of contributors on the commits?
The number of contributors on the previous releases seem a bit off ^^'.

For instance I'm using:

git shortlog --summary --numbered --email 5.2.2..5.2.3

@directionless
Copy link
Member

We might've to temporarily disable the readthedocs check since the 5.2.3 branch didn't have the fix for it.

I'd merge this to master and not to the release tag. I think merging to the release tag is probably an antipattern -- it would change the release.

@directionless
Copy link
Member

NOTE: this also contains the changelog for 5.2.2 which was pushed after the 5.2.2 tag, so it wasn't contained in the 5.2.3 branch.

I think we concluded we were going to remove 5.2.2 from the changelog? If so, the contributor could should be based from 5.1.0. If not, the changelog should omit the 5.2.2 items

@Smjert
Copy link
Member Author

Smjert commented Apr 26, 2022

I think we concluded we were going to remove 5.2.2 from the changelog? If so, the contributor could should be based from 5.1.0. If not, the changelog should omit the 5.2.2 items

I'm not sure why we should remove it?
5.2.2 is a stable release that contains the M1 port and its changelog is already present on master

@Smjert Smjert force-pushed the stefano/release/changelog-5.2.3 branch from bce8e1f to af1e669 Compare April 26, 2022 18:04
@Smjert Smjert requested a review from a team as a code owner April 26, 2022 18:04
@Smjert Smjert changed the base branch from release/v5.2.3 to master April 26, 2022 18:04
@Smjert Smjert closed this Apr 26, 2022
@Smjert Smjert reopened this Apr 26, 2022
@mike-myers-tob
Copy link
Member

Yea, I think maybe @directionless is recalling a few point release (5.2.1 and 5.2.2) that represented quick fixes to problems we discovered during pre-release. But 5.2.2. was the final release of 5.2, and that should remain on the record.

5.2.3 is not a fix to our mistakes in 5.2, but rather a security release with dependency updates.

@directionless
Copy link
Member

I think we concluded we were going to remove 5.2.2 from the changelog? If so, the contributor could should be based from 5.1.0. If not, the changelog should omit the 5.2.2 items

I'm not sure why we should remove it? 5.2.2 is a stable release that contains the M1 port and its changelog is already present on master

Oh yes, I'd forgotten which version went with what.

@mike-myers-tob mike-myers-tob merged commit 7c9ec61 into osquery:master Apr 29, 2022
@mike-myers-tob mike-myers-tob deleted the stefano/release/changelog-5.2.3 branch April 29, 2022 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants