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

ARROW-16654: [Dev][Archery] Support cherry-picking for major releases #13230

Closed
wants to merge 2 commits into from

Conversation

kszucs
Copy link
Member

@kszucs kszucs commented May 25, 2022

Run the following to see what would happens without executing it:

archery release --jira-cache /tmp/jiracache cherry-pick 9.0.0 

Try creating a maint-9.0.0 branch based off of the master branch:

archery release --jira-cache /tmp/jiracache cherry-pick 9.0.0 --execute

Now there should be the maint-9.0.0 branch checked out locally. Rerunning the previous command with --continue option would do nothing since there are no new commits to apply:

archery release --jira-cache /tmp/jiracache cherry-pick 9.0.0 --execute --continue

So simulate new commits be resetting maint-9.0.0 branch to three commits before the current master:

git branch -f maint-9.0.0 master~3

Apply the new patches:

archery release --jira-cache /tmp/jiracache cherry-pick 9.0.0 --execute --continue

@github-actions
Copy link

@github-actions
Copy link

⚠️ Ticket has not been started in JIRA, please click 'Start Progress'.

@kszucs kszucs requested a review from kou May 25, 2022 12:40
@kszucs
Copy link
Member Author

kszucs commented May 25, 2022

cc @raulcd @assignUser

Copy link
Member

@raulcd raulcd left a comment

Choose a reason for hiding this comment

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

I have tested locally and all looks great to me. Just a really minor comment.
Thanks for doing this @kszucs !

dev/archery/archery/release.py Outdated Show resolved Hide resolved
return []

commit_range = "{}..{}".format(lower, upper)
commit_range = f"{lower}..{upper}"
Copy link
Member

Choose a reason for hiding this comment

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

I love the f-string changes. Thanks!

Copy link
Member

@kou kou left a comment

Choose a reason for hiding this comment

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

+1

Comment on lines 907 to 908
if not dry_run:
release.cherry_pick_commits(recreate_branch=recreate)
Copy link
Member

Choose a reason for hiding this comment

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

How about moving dry_run mode implementation to Release?

Suggested change
if not dry_run:
release.cherry_pick_commits(recreate_branch=recreate)
release.cherry_pick_commits(recreate_branch=recreate, dry_run=dry_run)

Release knows what git command lines should be ran. If we move dry_run mode implementation to Release, we can implement dry_run mode and non dry_run mode nearby.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good idea, but may handle it in follow-up PR.

@kszucs kszucs closed this in 02af333 May 30, 2022
@ursabot
Copy link

ursabot commented May 30, 2022

Benchmark runs are scheduled for baseline = 0066e0e and contender = 02af333. 02af333 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.16% ⬆️0.0%] test-mac-arm
[Failed ⬇️0.36% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.51% ⬆️0.08%] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 02af333b ec2-t3-xlarge-us-east-2
[Finished] 02af333b test-mac-arm
[Finished] 02af333b ursa-i9-9960x
[Finished] 02af333b ursa-thinkcentre-m75q
[Finished] 0066e0ea ec2-t3-xlarge-us-east-2
[Failed] 0066e0ea test-mac-arm
[Failed] 0066e0ea ursa-i9-9960x
[Finished] 0066e0ea ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

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.

4 participants