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.

Sign up for GitHub

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

Jump to bottom

[Dev] Update the pull request merge script to work with master or main #33005

Closed
Tracked by #31142
asfimport opened this issue Sep 19, 2022 · 0 comments · Fixed by #14533
Closed
Tracked by #31142

[Dev] Update the pull request merge script to work with master or main #33005

asfimport opened this issue Sep 19, 2022 · 0 comments · Fixed by #14533
Labels
Component: Developer Tools Type: task
Milestone
11.0.0

Comments

@asfimport
Copy link

Reporter: Fiona La / @lafiona
Assignee: Fiona La / @lafiona

PRs and other links:

Note: This issue was originally created as ARROW-17777. Please see the migration documentation for further details.
@asfimport asfimport mentioned this issue Jan 11, 2023
Open
14 tasks
@github-actions github-actions bot mentioned this issue Jan 11, 2023
Merged
raulcd added a commit that referenced this issue Jan 12, 2023
@lafiona @sreeharihegden
@pitrou @raulcd @kevingurney
GH-33005: [Dev] Update the pull request merge script to work with mas…
3d26a43 
…ter or main (#14533)

# Overview
The goal of this pull request is to update the GitHub merge script to work with a repository default branch named `master` or `main`, as part of the effort to rename the Apache Arrow repository's default branch to `main`. The parent Jira ticket can be found [here](https://issues.apache.org/jira/browse/ARROW-15689). 

# Implementation
- In `.github/workflows/dev.yml`, get and pass the default branch name to the merge test script. 
- Added a function named `git_default_branch_name` to `dev/merge_arrow_pr.py`.
- Used `git_default_branch_name` to replace hard-coded usages of `master` in the file.

# Testing
- Ran the `dev/merge_arrow_pr.py` in debug mode to confirm that there are no errors when attempting to merge an existing pull request.
- Ran `test_merge_arrow_pr.py` locally to confirm there are no failures.

# Future Directions
Updated ARROW-18011 to include updating the hard-coded `master` value in `test_merge_arrow_pr.py`.

# Notes
Thank you @ kevingurney for your help with this pull request!
* Closes: #33005

Lead-authored-by: Fiona La <fionala7@gmail.com>
Co-authored-by: lafiona <fionala7@gmail.com>
Co-authored-by: Sreehari Hegden <sreehari.hegden@gmail.com>
Co-authored-by: Antoine Pitrou <pitrou@free.fr>
Co-authored-by: Raúl Cumplido <raulcumplido@gmail.com>
Co-authored-by: Kevin Gurney <kgurney@mathworks.com>
Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
@raulcd raulcd added this to the 11.0.0 milestone Jan 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Component: Developer Tools Type: task
Projects
None yet
Milestone
11.0.0
Development

Successfully merging a pull request may close this issue.

GH-33005: [Dev] Update the pull request merge script to work with master or main mathworks/arrow
2 participants
@raulcd @asfimport