Skip to content

ARROW-2185: Strip CI directives from commit messages #1639

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

Closed
wesm wants to merge 3 commits into from
Closed

ARROW-2185: Strip CI directives from commit messages #1639

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baa7e2c
Strip CI directives from commit messages when preparing squashed comm…
wesm Feb 21, 2018
75c3b17
Do not eat closing braces
wesm Feb 22, 2018
adf038d
Fix regex [skip ci] [skip travis] [skip appveyor]
wesm Feb 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions dev/merge_arrow_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ def merge_pr(pr_num, target_ref):
"Closes #%s from %s and squashes the following commits:"
% (pr_num, pr_repo_desc)]
for c in commits:
merge_message_flags += ["-m", c]
stripped_message = strip_ci_directives(c).strip()
merge_message_flags += ["-m", stripped_message]

run_cmd(['git', 'commit',
'--no-verify', # do not run commit hooks
Expand All @@ -199,6 +200,15 @@ def merge_pr(pr_num, target_ref):
return merge_hash


_REGEX_CI_DIRECTIVE = re.compile('\[[^\]]*\]')


def strip_ci_directives(commit_message):
# Remove things like '[force ci]', '[skip appveyor]' from the assembled
# commit message
return _REGEX_CI_DIRECTIVE.sub('', commit_message)


def fix_version_from_branch(branch, versions):
# Note: Assumes this is a sorted (newest->oldest) list of un-released
# versions
Expand All @@ -209,7 +219,7 @@ def fix_version_from_branch(branch, versions):
return [x for x in versions if x.name.startswith(branch_ver)][-1]


def exctract_jira_id(title):
def extract_jira_id(title):
m = re.search(r'^(ARROW-[0-9]+)\b.*$', title)
if m:
return m.group(1)
Expand All @@ -219,7 +229,7 @@ def exctract_jira_id(title):


def check_jira(title):
jira_id = exctract_jira_id(title)
jira_id = extract_jira_id(title)
asf_jira = jira.client.JIRA({'server': JIRA_API_BASE},
basic_auth=(JIRA_USERNAME, JIRA_PASSWORD))
try:
Expand All @@ -232,7 +242,7 @@ def resolve_jira(title, merge_branches, comment):
asf_jira = jira.client.JIRA({'server': JIRA_API_BASE},
basic_auth=(JIRA_USERNAME, JIRA_PASSWORD))

default_jira_id = exctract_jira_id(title)
default_jira_id = extract_jira_id(title)

jira_id = input("Enter a JIRA id [%s]: " % default_jira_id)
if jira_id == "":
Expand Down