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

Automatic cherry-pick script #339

Merged
merged 7 commits into from
Jun 3, 2021
Merged

Conversation

alamb
Copy link
Contributor

@alamb alamb commented May 22, 2021

Which issue does this PR close?

re #292

Rationale for this change

The idea from the New Releaes Process Proposal document is to make releases every other week from the active_release branch but merge all new code changes to master

Thus we need a way to port changes that are "safe" for minor and patch releases to the active_release branch

What changes are included in this PR?

This PR proposes adding a cherry-pick-pr.py script to automate the process of backporting / cherry-picking changes from master to active_release.

Example

I ran this script on a local copy of https://github.com/alamb/arrow-rs with the following commands, which created alamb#1

git clone git@github.com:alamb/arrow-rs.git /tmp/arrow-rs
CHECKOUT_ROOT=/tmp/arrow-rs CHERRY_PICK_SHA=71c21595a0856e4f87838c8c3bb5f2b04fb88024  python3 dev/release/cherry-pick-pr.py

Next steps

I plan to run this script as a github action to automatically create proposed cherry-pick PRs for all commits to master. In the interim we can run it manually to create cherry-pick PRs for the 4.1.1 / 4.2.0 release.

Are there any user-facing changes?

No

@codecov-commenter
Copy link

Codecov Report

Merging #339 (1b98ebc) into master (a25cafb) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #339   +/-   ##
=======================================
  Coverage   82.53%   82.53%           
=======================================
  Files         162      162           
  Lines       44043    44043           
=======================================
  Hits        36351    36351           
  Misses       7692     7692           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a25cafb...1b98ebc. Read the comment docs.

@alamb
Copy link
Contributor Author

alamb commented Jun 3, 2021

I am going to merge this in and iterate on it in situ

@alamb alamb merged commit 239558b into apache:master Jun 3, 2021
@alamb alamb deleted the alamb/cherry-pick-release branch June 3, 2021 21:50
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