From 2571d213c60508abeb13d9ec8ca432746f8bd256 Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Fri, 1 Dec 2023 14:43:14 +0000
Subject: [PATCH] Update CI files

[noissue]
---
 .github/template_gitref                       |  2 +-
 .github/workflows/release.yml                 |  2 +-
 .../scripts/install_python_client.sh          | 19 +++++++++++++++++--
 .github/workflows/scripts/publish_docs.sh     | 13 -------------
 .github/workflows/test.yml                    |  2 +-
 CHANGES/.TEMPLATE.rst                         | 14 +++++++++++++-
 CHANGES/.gitignore                            |  1 -
 7 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/.github/template_gitref b/.github/template_gitref
index 3546645658..5eb4b23f51 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-unknown
+2021.08.26-290-g4d54366
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7c1bfb70e..f22bee989d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -107,7 +107,7 @@ jobs:
       - name: "Install python dependencies"
         run: |
           echo ::group::PYDEPS
-          pip install towncrier twine wheel httpie docker netaddr boto3 ansible
+          pip install towncrier twine wheel httpie docker netaddr boto3 ansible mkdocs
           echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulpcore/.ci/assets/httpie/" >> $GITHUB_ENV
           echo ::endgroup::
 
diff --git a/.github/workflows/scripts/install_python_client.sh b/.github/workflows/scripts/install_python_client.sh
index a50d7497dc..f4eb67b1b0 100755
--- a/.github/workflows/scripts/install_python_client.sh
+++ b/.github/workflows/scripts/install_python_client.sh
@@ -26,8 +26,8 @@ rm -rf pulpcore-client
 pushd pulpcore-client
 python setup.py sdist bdist_wheel --python-tag py3
 
-twine check "dist/pulpcore_client-$VERSION-py3-none-any.whl" || exit 1
-twine check "dist/pulpcore-client-$VERSION.tar.gz" || exit 1
+twine check "dist/pulpcore_client-$VERSION-py3-none-any.whl"
+twine check "dist/pulpcore-client-$VERSION.tar.gz"
 
 cmd_prefix pip3 install "/root/pulp-openapi-generator/pulpcore-client/dist/pulpcore_client-${VERSION}-py3-none-any.whl"
 tar cvf ../../pulpcore/core-python-client.tar ./dist
@@ -37,6 +37,21 @@ find ./docs/* -exec sed -i 's/README//g' {} \;
 cp README.md docs/index.md
 sed -i 's/docs\///g' docs/index.md
 find ./docs/* -exec sed -i 's/\.md//g' {} \;
+
+cat >> mkdocs.yml << DOCSYAML
+---
+site_name: Pulpcore Client
+site_description: Core bindings
+site_author: Pulp Team
+site_url: https://docs.pulpproject.org/pulpcore_client/
+repo_name: pulp/pulpcore
+repo_url: https://github.com/pulp/pulpcore
+theme: readthedocs
+DOCSYAML
+
+# Building the bindings docs
+mkdocs build
+
 tar cvf ../../pulpcore/core-python-client-docs.tar ./docs
 popd
 popd
diff --git a/.github/workflows/scripts/publish_docs.sh b/.github/workflows/scripts/publish_docs.sh
index 39d3e23e9c..1207c315cd 100755
--- a/.github/workflows/scripts/publish_docs.sh
+++ b/.github/workflows/scripts/publish_docs.sh
@@ -39,19 +39,6 @@ fi
 mkdir -p ../core-bindings
 tar -xvf core-python-client-docs.tar --directory ../core-bindings
 pushd ../core-bindings
-cat >> mkdocs.yml << DOCSYAML
----
-site_name: Pulpcore Client
-site_description: Core bindings
-site_author: Pulp Team
-site_url: https://docs.pulpproject.org/pulpcore_client/
-repo_name: pulp/pulpcore
-repo_url: https://github.com/pulp/pulpcore
-theme: readthedocs
-DOCSYAML
-
-# Building the bindings docs
-mkdocs build
 
 # publish to docs.pulpproject.org/pulpcore_client
 rsync -avzh site/ doc_builder_pulpcore@docs.pulpproject.org:/var/www/docs.pulpproject.org/pulpcore_client/
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa3e5a760e..ba82fa716b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -51,7 +51,7 @@ jobs:
       - name: "Install python dependencies"
         run: |
           echo ::group::PYDEPS
-          pip install towncrier twine wheel httpie docker netaddr boto3 ansible
+          pip install towncrier twine wheel httpie docker netaddr boto3 ansible mkdocs
           echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulpcore/.ci/assets/httpie/" >> $GITHUB_ENV
           echo ::endgroup::
 
diff --git a/CHANGES/.TEMPLATE.rst b/CHANGES/.TEMPLATE.rst
index 013cc3d43b..49c2305d7b 100644
--- a/CHANGES/.TEMPLATE.rst
+++ b/CHANGES/.TEMPLATE.rst
@@ -1,4 +1,12 @@
-{# TOWNCRIER TEMPLATE #}
+{% if render_title %}
+{% if versiondata.name %}
+{{ versiondata.name }} {{ versiondata.version }} ({{ versiondata.date }})
+{{ top_underline * ((versiondata.name + versiondata.version + versiondata.date)|length + 4)}}
+{% else %}
+{{ versiondata.version }} ({{ versiondata.date }})
+{{ top_underline * ((versiondata.version + versiondata.date)|length + 3)}}
+{% endif %}
+{% endif %}
 {% for section, _ in sections.items() %}
 {% set underline = underlines[0] %}{% if section %}{{section}}
 {{ underline * section|length }}{% set underline = underlines[1] %}
@@ -33,3 +41,7 @@ No significant changes.
 
 {% endif %}
 {% endfor %}
+----
+
+
+
diff --git a/CHANGES/.gitignore b/CHANGES/.gitignore
index 4397c3a32c..f935021a8f 100644
--- a/CHANGES/.gitignore
+++ b/CHANGES/.gitignore
@@ -1,2 +1 @@
 !.gitignore
-