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

Improve release scripts #6999

Merged
merged 7 commits into from Sep 27, 2023
Merged

Improve release scripts #6999

merged 7 commits into from Sep 27, 2023

Conversation

deivid-rodriguez
Copy link
Member

What was the end-user or developer problem that led to this PR?

Try to make generating release PRs easier. I used this branch to generate #6985.

What is your fix for the problem, implemented in this PR?

To reduce the number of conflicts that need to be manually solved, I made it so you can use an initial branch with some manually added commits. I used this to start with an autocorrect of some rubocop rules that are enforced in the master branch and were generating conflicts. Also to cherry-pick some PRs that were merged using squash or rebase, and that the scripts can't cherry-pick automatically.

Make sure the following tasks are checked

So I can manually cherry-pick some initial commits to it.
If cherry-picking succeeded, but changelog generation or version bumps
failed, we can keep the cherry-picking. So let's keep an in-progress
release branch and never delete it.
It always fails since we're already in the branch. Instead, pick it up
if it already exists and don't try to create it.
Ctrl-D exits with `0` status and continues the release script instead of
aborting and resetting to the original state.
@deivid-rodriguez deivid-rodriguez merged commit a0ccdd0 into master Sep 27, 2023
83 checks passed
@deivid-rodriguez deivid-rodriguez deleted the improve-release-scripts branch September 27, 2023 08:21
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

1 participant