From 1212e46892b27b668ba367cc044a6c7c2e65f3b8 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Mon, 2 Dec 2024 10:09:59 +0100 Subject: [PATCH 1/3] chore(IDX): update cla bot name --- reusable_workflows/check_cla/check_cla_pr.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/reusable_workflows/check_cla/check_cla_pr.py b/reusable_workflows/check_cla/check_cla_pr.py index efc2752..a1b91c0 100644 --- a/reusable_workflows/check_cla/check_cla_pr.py +++ b/reusable_workflows/check_cla/check_cla_pr.py @@ -12,8 +12,8 @@ APPROVED_LABEL = "cla:agreed" GH_WORKFLOW_LABEL = "cla:gh-wf-pending" -DFINITY_BOT_NAME = "sa-github-api" -DFINITY_BOT_NAME_OLD = "dfinity-droid-prod[bot]" +# keep all old bot names for backwards compatibility +CLA_BOT_NAMES = ["cla-idx-bot", "sa-github-api", "dfinity-droid-prod[bot]"] class CLAHandler: @@ -56,10 +56,7 @@ def check_if_cla_signed(self, issue: GHIssue, user: str) -> bool: def get_cla_issue(self, user: str) -> Optional[GHIssue]: for issue in self.cla_repo.issues(): - if issue.title == f"cla: @{user}" and issue.user.login in [ - DFINITY_BOT_NAME, - DFINITY_BOT_NAME_OLD, - ]: + if issue.title == f"cla: @{user}" and issue.user.login in CLA_BOT_NAMES: return issue print(f"No CLA issue for {user}") return None # to make linter happy From c508e29dd8fd7ddfcbd50486a5b4177a111aa04e Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Mon, 2 Dec 2024 10:16:49 +0100 Subject: [PATCH 2/3] update --- reusable_workflows/check_cla/check_cla_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reusable_workflows/check_cla/check_cla_pr.py b/reusable_workflows/check_cla/check_cla_pr.py index a1b91c0..ca0e4ae 100644 --- a/reusable_workflows/check_cla/check_cla_pr.py +++ b/reusable_workflows/check_cla/check_cla_pr.py @@ -25,7 +25,7 @@ def check_comment_already_exists( self, comments: github3.structs.GitHubIterator ) -> bool: for comment in comments: - if comment.user.login == DFINITY_BOT_NAME: + if comment.user.login in CLA_BOT_NAMES: return True return False From ffc84a5432a19d4cd6178541793f4cfd5878113f Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Mon, 2 Dec 2024 10:18:23 +0100 Subject: [PATCH 3/3] update --- reusable_workflows/check_cla/check_cla_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reusable_workflows/check_cla/check_cla_pr.py b/reusable_workflows/check_cla/check_cla_pr.py index ca0e4ae..150b498 100644 --- a/reusable_workflows/check_cla/check_cla_pr.py +++ b/reusable_workflows/check_cla/check_cla_pr.py @@ -13,7 +13,7 @@ GH_WORKFLOW_LABEL = "cla:gh-wf-pending" # keep all old bot names for backwards compatibility -CLA_BOT_NAMES = ["cla-idx-bot", "sa-github-api", "dfinity-droid-prod[bot]"] +CLA_BOT_NAMES = ["cla-idx-bot[bot]", "sa-github-api", "dfinity-droid-prod[bot]"] class CLAHandler: