Skip to content

Commit a571359

Browse files
authored
Merge branch 'master' into actor_ttl
2 parents b6e3d6c + 59abd5d commit a571359

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

.github/scripts/automerge.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818

1919
g = Github(os.getenv("GITHUB_TOKEN"))
2020
repo = g.get_repo(os.getenv("GITHUB_REPOSITORY"))
21-
maintainers = [m.strip() for m in os.getenv("MAINTAINERS").split(',')]
2221

2322
def fetch_pulls(mergeable_state):
2423
return [pr for pr in repo.get_pulls(state='open', sort='created') \
2524
if pr.mergeable_state == mergeable_state and 'auto-merge' in [l.name for l in pr.labels]]
2625

2726
def is_approved(pr):
28-
approvers = [r.user.login for r in pr.get_reviews() if r.state == 'APPROVED' and r.user.login in maintainers]
27+
approvers = [r.user.login for r in pr.get_reviews() if r.state == 'APPROVED']
2928
return len([a for a in approvers if repo.get_collaborator_permission(a) in ['admin', 'write']]) > 0
3029

3130
# First, find a PR that can be merged

.github/workflows/automerge-bot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@ jobs:
2727
run: pip install PyGithub
2828
- name: Automerge and update
2929
env:
30-
MAINTAINERS: artursouza,mukundansundar
3130
GITHUB_TOKEN: ${{ secrets.DAPR_BOT_TOKEN }}
3231
run: python ./.github/scripts/automerge.py

0 commit comments

Comments
 (0)