Skip to content

prepare-embargoed-branches: special-case some older release trains #131

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

Merged
merged 2 commits into from
Aug 12, 2025

Conversation

dscho
Copy link
Member

@dscho dscho commented Jul 11, 2025

I had to release some security bug fix releases recently that did not quite follow a previous version. For example, there was a gap between Git for Windows v2.47.1(2) and MinGit v2.47.3 (there was no Git for Windows nor MinGit v2.47.2).

To accommodate for this, I came up with these patches (and used them in the private repository where the embargoed releases were built).

The `[^0-9]` shell pattern is not portable to Dash, which we use in the
GitHub automation.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho requested review from mjcheetham and rimrul July 11, 2025 11:24
@dscho dscho self-assigned this Jul 11, 2025
previous_version_prefix=2.46.2
;;
2.47.2)
# There was no Git for Windows v2.47.3, so we use v2.47.1(2)
Copy link
Member

Choose a reason for hiding this comment

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

/2.47.3/2.47.2/

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually, no... This switch case is about the previous version, that is, the script is called with v2.47.3 and previous_version will then be set to 2.47.2...

Copy link
Member

Choose a reason for hiding this comment

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

Yes, the switch seems to be correct, but the comment claims that 2.47.3 didn't exist, whereas the code special cases 2.47.2 not existing.

Copy link
Member Author

Choose a reason for hiding this comment

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

Aaah! You are right. Fixed.

These two versions do not have _strict_ predecessors in Git for Windows,
as Git for Windows v2.46.3 and v2.47.2 were never released. Let's
special-case these two versions so that we can prepare embargoed
branches for them, too. We simply use the closest preceding Git for
Windows versions that _were_ released.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho force-pushed the prepare-embargoed-branches-for-old-versions branch from c3f204a to 62979d5 Compare August 12, 2025 10:35
@dscho dscho requested a review from rimrul August 12, 2025 10:36
@dscho dscho merged commit cc8523e into main Aug 12, 2025
@dscho dscho deleted the prepare-embargoed-branches-for-old-versions branch August 12, 2025 11:00
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.

2 participants