From: Michał Kępień Date: Mon, 3 Jun 2024 11:07:21 +0000 (+0200) Subject: Fail for branches using old-style version suffixes X-Git-Tag: v9.20.0~15^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09851e62309f55bb3e6e3bc7299db95929827f76;p=thirdparty%2Fbind9.git Fail for branches using old-style version suffixes Using "-v9_x" and "-v9.x" version suffixes for branch names is now deprecated since some automation logic does not handle these. Fail for any merge request using such old-style version suffixes. --- diff --git a/dangerfile.py b/dangerfile.py index fe0d2ad0a3f..c3f63688b34 100644 --- a/dangerfile.py +++ b/dangerfile.py @@ -52,6 +52,7 @@ affected_files = ( danger.git.modified_files + danger.git.created_files + danger.git.deleted_files ) mr_labels = danger.gitlab.mr.labels +source_branch = danger.gitlab.mr.source_branch target_branch = danger.gitlab.mr.target_branch is_backport = "Backport" in mr_labels or "Backport::Partial" in mr_labels is_full_backport = is_backport and "Backport::Partial" not in mr_labels @@ -63,6 +64,23 @@ gl = gitlab.Gitlab( proj = gl.projects.get(os.environ["CI_PROJECT_ID"]) mr = proj.mergerequests.get(os.environ["CI_MERGE_REQUEST_IID"]) +############################################################################### +# BRANCH NAME +############################################################################### +# +# - FAIL if the source branch of the merge request includes an old-style +# "-v9_x" or "-v9.x" suffix. + +branch_name_regex = r"^(?P.*?)(?P-v9[_.](?P[0-9]+))$" +match = re.match(branch_name_regex, source_branch) +if match: + fail( + f"Source branch name `{source_branch}` includes an old-style version " + f"suffix (`{match.group('suffix')}`). Using such suffixes is now " + "deprecated. Please resubmit the merge request with the branch name " + f"set to `{match.group('base')}-bind-9.{match.group('version')}`." + ) + ############################################################################### # COMMIT MESSAGES ###############################################################################