Skip to content

ARROW-9703: [Developer][Archery] Restartable cherry-picking process for creating maintenance branches#7932

Closed
kszucs wants to merge 17 commits intoapache:masterfrom
kszucs:archery-patch-release
Closed

ARROW-9703: [Developer][Archery] Restartable cherry-picking process for creating maintenance branches#7932
kszucs wants to merge 17 commits intoapache:masterfrom
kszucs:archery-patch-release

Conversation

@kszucs
Copy link
Copy Markdown
Member

@kszucs kszucs commented Aug 11, 2020

Refactored the release related utilities and also covered the main components with unit tests.

Updated the cherry-picking command to calculate the patches required to pick but not yet picked to the maintenance branch, so the cherry-picking procedure can be restarted now.

  1. archery release cherry-pick 1.0.1 --execute --recreate: re-creates maint-1.0.x and tries to apply all the required patches
  2. archery release cherry-pick 1.0.1 --execute --continue: in case of a merge conflict the process can be continued

@github-actions
Copy link
Copy Markdown

Thanks for opening a pull request!

Could you open an issue for this pull request on JIRA?
https://issues.apache.org/jira/browse/ARROW

Then could you also rename pull request title in the following format?

ARROW-${JIRA_ID}: [${COMPONENT}] ${SUMMARY}

See also:

@kszucs kszucs changed the title [Developer] Refactor archery release scripts [WIP] ARROW-9703: [Developer][Archery] Restartable cherry-picking process for creating maintenance branches Aug 12, 2020
@kszucs kszucs force-pushed the archery-patch-release branch from e87c481 to 078e75c Compare August 12, 2020 13:00
@github-actions
Copy link
Copy Markdown

@kszucs
Copy link
Copy Markdown
Member Author

kszucs commented Aug 17, 2020

The tests are passing locally, but the arrow repository gets fetched differently on github actions, so need to fix that before merging.

@kszucs kszucs force-pushed the archery-patch-release branch from eb67740 to a4a2530 Compare September 15, 2020 14:34
@kszucs kszucs changed the title ARROW-9703: [Developer][Archery] Restartable cherry-picking process for creating maintenance branches ARROW-9703: [Developer][Archery] Restartable cherry-picking process for creating maintenance branches [WIP] Sep 15, 2020
@kszucs kszucs changed the title ARROW-9703: [Developer][Archery] Restartable cherry-picking process for creating maintenance branches [WIP] ARROW-9703: [Developer][Archery] Restartable cherry-picking process for creating maintenance branches Sep 15, 2020
@kszucs kszucs force-pushed the archery-patch-release branch from edb2b5c to 77f5c8f Compare September 15, 2020 15:45
Copy link
Copy Markdown
Member Author

@kszucs kszucs left a comment

Choose a reason for hiding this comment

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

Used it for the last release and it worked nicely.

+1, merging on green

@kszucs kszucs closed this in 44685e2 Sep 15, 2020
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.

1 participant