From 59abd5dbccf0b173876b62dfbec21f9a84955503 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Fri, 28 Feb 2025 16:43:46 -0800 Subject: [PATCH] Does not rely on MAINTAINERS env for merging with auto-merge (#1224) Signed-off-by: Artur Souza --- .github/scripts/automerge.py | 3 +-- .github/workflows/automerge-bot.yml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/scripts/automerge.py b/.github/scripts/automerge.py index d8c957575..b3428aee8 100644 --- a/.github/scripts/automerge.py +++ b/.github/scripts/automerge.py @@ -18,14 +18,13 @@ from github import Github g = Github(os.getenv("GITHUB_TOKEN")) repo = g.get_repo(os.getenv("GITHUB_REPOSITORY")) -maintainers = [m.strip() for m in os.getenv("MAINTAINERS").split(',')] def fetch_pulls(mergeable_state): return [pr for pr in repo.get_pulls(state='open', sort='created') \ if pr.mergeable_state == mergeable_state and 'auto-merge' in [l.name for l in pr.labels]] def is_approved(pr): - approvers = [r.user.login for r in pr.get_reviews() if r.state == 'APPROVED' and r.user.login in maintainers] + approvers = [r.user.login for r in pr.get_reviews() if r.state == 'APPROVED'] return len([a for a in approvers if repo.get_collaborator_permission(a) in ['admin', 'write']]) > 0 # First, find a PR that can be merged diff --git a/.github/workflows/automerge-bot.yml b/.github/workflows/automerge-bot.yml index 2ff0c795c..b2a301156 100644 --- a/.github/workflows/automerge-bot.yml +++ b/.github/workflows/automerge-bot.yml @@ -27,6 +27,5 @@ jobs: run: pip install PyGithub - name: Automerge and update env: - MAINTAINERS: artursouza,mukundansundar GITHUB_TOKEN: ${{ secrets.DAPR_BOT_TOKEN }} run: python ./.github/scripts/automerge.py