From 4e40770e386cd0491ca59c9a72d93d10dd76d5d9 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 21 Apr 2024 02:36:14 +0000 Subject: [PATCH] Update CI files [noissue] --- .ci/scripts/check_release.py | 34 +++++----------------------------- .github/template_gitref | 2 +- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/.ci/scripts/check_release.py b/.ci/scripts/check_release.py index 283d17ce..0872feb4 100755 --- a/.ci/scripts/check_release.py +++ b/.ci/scripts/check_release.py @@ -82,35 +82,11 @@ def main(): f"{last_tag}", f"origin/{branch}", "--name-only", "--", "requirements.txt" ) if z_changelog or req_txt_diff: - # Blobless clone does not have file contents for Z branches, - # check commit message for last Z bump - git_branch = f"origin/{branch}" - next_version = None - bump_commit = repo.git.log( - "--oneline", - "--grep=Bump version", - "-n 1", - git_branch, - "--", - ".bumpversion.cfg", - ) - if bump_commit: - next_version = bump_commit.split("→ ")[-1] - # If not found - try old-commit-msg - if not next_version: - bump_commit = repo.git.log( - "--oneline", - "--grep=Bump to", - "-n 1", - git_branch, - "--", - ".bumpversion.cfg", - ) - next_version = bump_commit.split("to ")[-1] if bump_commit else None - - # You could, theoretically, be next_vers==None here - but that's always - # been true for this script. - next_version = Version(next_version) + curr_version = Version(last_tag) + assert curr_version.base_version.startswith( + branch + ), "Current-version has to belong to the current branch!" + next_version = Version(f"{branch}.{curr_version.micro + 1}") reason = "CHANGES" if z_changelog else "requirements.txt" print( f"A Z-release is needed for {branch}, " diff --git a/.github/template_gitref b/.github/template_gitref index 9ec4e6fe..418b21cd 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-326-ge5addc7 +2021.08.26-327-g6a0d984