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

v0.25.3 release preparation #53

Merged
merged 2 commits into from
Nov 22, 2023
Merged

v0.25.3 release preparation #53

merged 2 commits into from
Nov 22, 2023

Conversation

cpu
Copy link
Member

@cpu cpu commented Nov 22, 2023

Description

This branch targets the rel-0.25 branch, which was branched from 22702f5, the last commit on main that's semver compatible with the 0.25.2 release cut from 4730449. It backports the CCADB trust root updates from #52 to prepare v0.25.3

Proposed Release Notes

New trust anchors:

Removed trust anchors:

@cpu cpu requested a review from djc November 22, 2023 17:07
@cpu cpu mentioned this pull request Nov 22, 2023
@cpu cpu self-assigned this Nov 22, 2023
Copy link
Member

@djc djc left a comment

Choose a reason for hiding this comment

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

Why not branch from 22702f5? Seems a bit more clear in terms of the commit history.

src/lib.rs Show resolved Hide resolved
@cpu
Copy link
Member Author

cpu commented Nov 22, 2023

Why not branch from 22702f5? Seems a bit more clear in terms of the commit history.

As in start the rel-0.25 branch from 22702f5? In the past when I've made the rel-xxx branches I've always branched from whatever commit was used for the most recent release in that stream, usually the one bumping the Cargo.toml version. It felt like the point releases should always pick up from where the last release left off 🤔

@djc
Copy link
Member

djc commented Nov 22, 2023

As in start the rel-0.25 branch from 22702f5? In the past when I've made the rel-xxx branches I've always branched from whatever commit was used for the most recent release in that stream, usually the one bumping the Cargo.toml version. It felt like the point releases should always pick up from where the last release left off 🤔

It seems fair game to me to pick a later commit from the main branch that is still compatible with the 0.25.x range. If we make this clear in the PR description (maybe including mentioning the first PR that introduced incompatible changes), I think that would be a cleaner way of maintaining the commit history.

@cpu
Copy link
Member Author

cpu commented Nov 22, 2023

I think that's reasonable for this repo where it's very clear what commit is the delineating point between compatible/incompatible. I will adjust 👍

@cpu cpu changed the base branch from rel-0.25 to main November 22, 2023 19:55
@cpu cpu changed the base branch from main to rel-0.25 November 22, 2023 19:55
@cpu
Copy link
Member Author

cpu commented Nov 22, 2023

  • Force pushed an updated rel-0.25 branched from 22702f5
  • Updated PR desc
  • Added a Cargo.toml version bump for 0.25.3.

@cpu cpu merged commit 54ccefa into rustls:rel-0.25 Nov 22, 2023
1 check passed
@cpu cpu deleted the cpu-0.25.3-prep branch November 22, 2023 20:00
@cpu
Copy link
Member Author

cpu commented Nov 22, 2023

I also noticed we were missing tags for 0.25.2, 0.25.1, and 0.25.0. I retroactively pushed all of those tags to GitHub (but haven't created GitHub releases for all of the historic tagged Cargo releases)

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.

None yet

2 participants