Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
'console_scripts': [
('lander-check-pulls='
'jenkinsgithublander.scripts.check_pulls:main'),
('lander-check-pull-mergable='
'jenkinsgithublander.scripts.check_pull_mergable:main'),
('lander-merge-result='
'jenkinsgithublander.scripts.merge_result:main'),
],
Expand Down
7 changes: 4 additions & 3 deletions src/jenkinsgithublander/github.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Helpers for interacting with Github api requests."""
from collections import namedtuple
import json
import re
import requests
from textwrap import dedent

Expand Down Expand Up @@ -60,7 +61,7 @@ def _is_mergeable(comments, owner, trigger, request_info):
user = comment['user']['login']

# Determine if a valid user has requested a merge.
if trigger in comment['body']:
if trigger.search(comment['body']):
if user_is_in_org(user, org, request_info):
request_merge = True

Expand Down Expand Up @@ -151,6 +152,7 @@ def mergeable_pull_requests(trigger_word, request_info):
log = logger.getLogger()
prs = get_open_pull_requests(request_info)
mergable_prs = []
trigger_re = re.compile(trigger_word)

if prs:
for pr in prs:
Expand All @@ -166,8 +168,7 @@ def mergeable_pull_requests(trigger_word, request_info):

if comments:
owner = pr_info.base_user
if _is_mergeable(
comments, owner, trigger_word, request_info):
if _is_mergeable(comments, owner, trigger_re, request_info):
mergable_prs.append(pr_info)
else:
log.debug(" No comments")
Expand Down