Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

[BAHIR-60] Script to merge pull requests #83

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

lukasz-antoniak
Copy link
Member

JIRA ticket: https://issues.apache.org/jira/browse/BAHIR-60

Sample output:

$ ./merge-pr.sh 3
Commits to be merged:
   8b307bd [BAHIR-1] Corner fix
   540f478 [BAHIR-1] Important feature
Maybe ask contributor to squash commits.
Continue "as is"? [y/n] y
Close pull request #3? [y/n] y
Commits pushed to origin/master.
Approver JIRA user: root
Approver JIRA password:
Specify assignee of JIRA ticket BAHIR-1 (current: root):
   0: root
   1: other
Chosen option: 1
Enter JIRA account name: lukasz
Specify fixed release version:
   0: 1.0.1
Chosen option: 0
JIRA ticket successfully updated.

If you comment out lines pushing changes to remote repository (line 125), clean-up of working directory (line 64), and two REST requests updating JIRA ticket (lines 182-205); you can perform a dry run to make sure the script works well.

Comments welcome. Improvement ideas?

@lukasz-antoniak
Copy link
Member Author

I have just pushed little more changes (validations, Git account configuration). Please let me know what you think and if direction is correct.

@lresende
Copy link
Member

lresende commented Apr 3, 2019

Thanks for this @lukasz-antoniak. I really would have hoped you didn't start from scratch but did small modifications on an existing merge script such as the one from Spark as that would give us the benefit of being used and tested in large scale in multiple projects for a little while. I would like to suggest you take a quick look at the merge-script from Spark and suggest what we should do as next steps: update this one versus adopting an existing one with modifications to any specific use case we might have.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants