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

ci: make v prefix optional in maintenance branch names #2655

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Conversation

dgw
Copy link
Member

@dgw dgw commented Feb 2, 2025

We aren't using the v prefix for maintenance branches. What we have are names like 7.1.x, 8.0.x, etc. and CI hasn't been running for 8.0 series maintenance patches like it should.

I already proposed this in the 8.0.2 release-prep PR (#2654), but it needs to be in the master branch too so future maintenance branches will get the new patterns automatically.

We aren't using the `v` prefix for maintenance branches. What we have
are names like `7.1.x`, `8.0.x`, etc. and CI hasn't been running for 8.0
series maintenance patches like it should.

I already proposed this in the 8.0.2 release-prep PR, but it needs to be
in the master branch too so future maintenance branches will get the new
patterns automatically.
@dgw dgw added the Build label Feb 2, 2025
@dgw dgw requested a review from a team February 2, 2025 21:31
@dgw
Copy link
Member Author

dgw commented Feb 2, 2025

Note: We could probably remove the v prefix entirely. The distinction is supposed to be:

  • *.*.x: maintenance branch
  • v*.*.*: release tag

But I went with the smaller change for now. We're allowed to change the convention, and no release tag should ever actually have a name ending in .x, so in theory we could use v prefix everywhere.

Copy link
Contributor

@SnoopJ SnoopJ left a comment

Choose a reason for hiding this comment

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

I approve of adjusting the workflow to match what's been done in the most recent release, making it optional is a nice middle-ground.

@dgw
Copy link
Member Author

dgw commented Feb 5, 2025

I figure there's no need to go through a whole new PR just to pull an added dev-requirements.txt comment line from #2654 upstream into master. I will get @SnoopJ's sign-off on the new comment via IRC (it was his idea).

Edit:

17:21:50 <+Sopel> [sopel] dgw commented on pull request #2655: I figure there's no need to go through a whole
new PR just to pull an added `dev-requirements.txt` comment line from #2654 upstream into `master`. I will
get @SnoopJ's sign-off on the new comment via IRC (it was his idea).
https://github.com/sopel-irc/sopel/pull/2655#issuecomment-2638257122
17:22:57 <+SnoopJ> :+1: 

:shipit: then

@dgw dgw mentioned this pull request Feb 5, 2025
@dgw dgw merged commit 6528e72 into master Feb 5, 2025
15 checks passed
@dgw dgw deleted the ci-maint-v-prefix branch February 5, 2025 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants