From 44febdca65d09f862c232a628672aedb659b6856 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Thu, 25 Apr 2024 08:52:35 -0400 Subject: [PATCH] temp: disable auto-merge only for edx-platform Details: https://github.com/openedx/axim-engineering/issues/1096 --- edx_repo_tools/repo_checks/repo_checks.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/edx_repo_tools/repo_checks/repo_checks.py b/edx_repo_tools/repo_checks/repo_checks.py index bc9c6ae2..763e5f02 100644 --- a/edx_repo_tools/repo_checks/repo_checks.py +++ b/edx_repo_tools/repo_checks/repo_checks.py @@ -15,7 +15,7 @@ import re import textwrap from functools import lru_cache -from itertools import chain +from itertools import chainf from pprint import pformat import click @@ -174,7 +174,10 @@ def __init__(self, api: GhApi, org: str, repo: str): self.expected_settings = { "has_issues": True, "has_wiki": False, - "allow_auto_merge": True, + # The goal is to have allow_auto_merge==True for all repos, but for now we need + # to turn it off for edx-platform due to some unresolved issues with its complex + # system of checks: https://github.com/openedx/axim-engineering/issues/1096 + "allow_auto_merge": self.repo_name != "edx-platform", "delete_branch_on_merge": True, }