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

Merged

raulcd merged 17 commits intoapache:masterfrom

mathworks:ARROW-17777

Jan 12, 2023

Commits on Jan 12, 2023

Add function to compute the default branch name from git, use the value to replace hard coded 'master' values.

lafiona
and
kevingurney
committed
Use python for processing the default branch reference from git.

lafiona
and
kevingurney
committed
Use the git environment in the yml file to get the default branch name, pass this value to the merge script.
lafiona
committed
Enable users who are calling the merge script from a git repository containing a head reference to get the default branch
lafiona
committed
Run linting
lafiona
committed
Apply branch renaming changes to refactoring changes in dev/merge_arrow_pr.py
lafiona
committed
Add default value for merge_branches in get_candidate_fix_version

committed
Added rstrip command to remove newline character after retrieving default branch name via git rev-parse.
lafiona
committed
Update dev/merge_arrow_pr.py to not use lstrip()

lafiona
and
pitrou
committed
Fix startswith call to use the correct string and remove unused code and unused input argument in fix_version_from_branch()
lafiona
committed
Modify call site of fix_version_from_branch to return a scalar value.
lafiona
committed
Remove merge_branches in argument list and body of get_candidate_fix_version().
lafiona
committed
Remove extra newline.
lafiona
committed
Update dev/merge_arrow_pr.py to avoid importing "warnings" module.

lafiona
and
raulcd
authored
Update dev/merge_arrow_pr.py

lafiona
and
raulcd
authored
Update .github/workflows/dev.yml

lafiona
and
raulcd
authored
Update dev/merge_arrow_pr.py

lafiona
and
raulcd
authored

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

GH-33005: [Dev] Update the pull request merge script to work with master or main#14533
raulcd merged 17 commits intoapache:masterfrom
mathworks:ARROW-17777

Commits on Jan 12, 2023

Add function to compute the default branch name from git, use the value to replace hard coded 'master' values.

Use python for processing the default branch reference from git.

Use the git environment in the yml file to get the default branch name, pass this value to the merge script.

Enable users who are calling the merge script from a git repository containing a head reference to get the default branch

Run linting

Apply branch renaming changes to refactoring changes in dev/merge_arrow_pr.py

Add default value for merge_branches in get_candidate_fix_version

Added rstrip command to remove newline character after retrieving default branch name via git rev-parse.

Update dev/merge_arrow_pr.py to not use lstrip()

Fix startswith call to use the correct string and remove unused code and unused input argument in fix_version_from_branch()

Modify call site of fix_version_from_branch to return a scalar value.

Remove merge_branches in argument list and body of get_candidate_fix_version().

Remove extra newline.

Update dev/merge_arrow_pr.py to avoid importing "warnings" module.

Update dev/merge_arrow_pr.py

Update .github/workflows/dev.yml

Update dev/merge_arrow_pr.py