From c7dce614c419750be5a5d433aebd9ecfda357a1c Mon Sep 17 00:00:00 2001
From: Pedro Brochado <pedropsb95@gmail.com>
Date: Wed, 17 Apr 2024 09:51:00 -0300
Subject: [PATCH] Fix plugin_template version

Previous bump used local uncommited material

[noissue]
---
 .ci/scripts/check_release.py        | 34 +++++------------------------
 .github/template_gitref             |  2 +-
 .github/workflows/scripts/script.sh |  6 -----
 .github/workflows/test.yml          |  1 -
 4 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/.ci/scripts/check_release.py b/.ci/scripts/check_release.py
index 1e89716df..a9139ea32 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 e169228ce..418b21cd4 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-327-g520b576
+2021.08.26-327-g6a0d984
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index 451cded97..3ec2739fa 100755
--- a/.github/workflows/scripts/script.sh
+++ b/.github/workflows/scripts/script.sh
@@ -45,12 +45,6 @@ if [[ "$TEST" = "docs" ]]; then
   exit
 fi
 
-if [[ "$TEST" = "new_docs" ]]; then
-  pip install --user git+https://github.com/pulp/pulp-docs
-  pulp-docs build
-  exit
-fi
-
 REPORTED_STATUS="$(pulp status)"
 
 echo "machine pulp
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 190dbf735..67e08b222 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,6 @@ jobs:
         env:
           - TEST: pulp
           - TEST: docs
-          - TEST: new_docs
           - TEST: azure
           - TEST: s3
           - TEST: lowerbounds