From a07dcdb8bb608bfdd3171998b8f13ff6b7b6209e Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 21 Jul 2024 02:39:26 +0000
Subject: [PATCH] Update CI files

[noissue]
---
 .github/template_gitref                       |  2 +-
 .../workflows/scripts/build_python_client.sh  | 12 ++------
 .../workflows/scripts/build_ruby_client.sh    | 30 ++-----------------
 docs/template_gitref                          |  2 +-
 4 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/.github/template_gitref b/.github/template_gitref
index 3afe71998c..3d9674dcd0 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-359-gdd9cdf7
+2021.08.26-361-gcd6f9f0
diff --git a/.github/workflows/scripts/build_python_client.sh b/.github/workflows/scripts/build_python_client.sh
index 148e89016e..41f3b530fc 100755
--- a/.github/workflows/scripts/build_python_client.sh
+++ b/.github/workflows/scripts/build_python_client.sh
@@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulpcore-client"
 
-# We need to copy that over to be visible in the container.
-cp "../pulpcore/core-api.json" .
-./gen-client.sh "core-api.json" "core" python "pulpcore"
+./gen-client.sh "../pulpcore/core-api.json" "core" python "pulpcore"
 
 pushd pulpcore-client
 python setup.py sdist bdist_wheel --python-tag py3
@@ -55,9 +53,7 @@ tar cvf ../../pulpcore/core-python-client-docs.tar ./site
 popd
 rm -rf "pulp_file-client"
 
-# We need to copy that over to be visible in the container.
-cp "../pulpcore/file-api.json" .
-./gen-client.sh "file-api.json" "file" python "pulp_file"
+./gen-client.sh "../pulpcore/file-api.json" "file" python "pulp_file"
 
 pushd pulp_file-client
 python setup.py sdist bdist_wheel --python-tag py3
@@ -92,9 +88,7 @@ tar cvf ../../pulpcore/file-python-client-docs.tar ./site
 popd
 rm -rf "pulp_certguard-client"
 
-# We need to copy that over to be visible in the container.
-cp "../pulpcore/certguard-api.json" .
-./gen-client.sh "certguard-api.json" "certguard" python "pulp_certguard"
+./gen-client.sh "../pulpcore/certguard-api.json" "certguard" python "pulp_certguard"
 
 pushd pulp_certguard-client
 python setup.py sdist bdist_wheel --python-tag py3
diff --git a/.github/workflows/scripts/build_ruby_client.sh b/.github/workflows/scripts/build_ruby_client.sh
index 099dca1a14..7259062f83 100755
--- a/.github/workflows/scripts/build_ruby_client.sh
+++ b/.github/workflows/scripts/build_ruby_client.sh
@@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulpcore-client"
 
-# We need to copy that over to be visible in the container.
-#cp "../pulpcore/core-api.json" .
-#./gen-client.sh "core-api.json" "core" ruby "pulpcore"
-
-# -------------
-# The generator still needs to have it called api.json at this time...
-cp "../pulpcore/api.json" .
-./gen-client.sh "api.json" "core" ruby "pulpcore"
-# -------------
+./gen-client.sh "../pulpcore/core-api.json" "core" ruby "pulpcore"
 
 pushd pulpcore-client
 gem build pulpcore_client
@@ -34,15 +26,7 @@ tar cvf "../../pulpcore/core-ruby-client.tar" "./pulpcore_client-"*".gem"
 popd
 rm -rf "pulp_file-client"
 
-# We need to copy that over to be visible in the container.
-#cp "../pulpcore/file-api.json" .
-#./gen-client.sh "file-api.json" "file" ruby "pulp_file"
-
-# -------------
-# The generator still needs to have it called api.json at this time...
-cp "../pulpcore/api.json" .
-./gen-client.sh "api.json" "file" ruby "pulp_file"
-# -------------
+./gen-client.sh "../pulpcore/file-api.json" "file" ruby "pulp_file"
 
 pushd pulp_file-client
 gem build pulp_file_client
@@ -50,15 +34,7 @@ tar cvf "../../pulpcore/file-ruby-client.tar" "./pulp_file_client-"*".gem"
 popd
 rm -rf "pulp_certguard-client"
 
-# We need to copy that over to be visible in the container.
-#cp "../pulpcore/certguard-api.json" .
-#./gen-client.sh "certguard-api.json" "certguard" ruby "pulp_certguard"
-
-# -------------
-# The generator still needs to have it called api.json at this time...
-cp "../pulpcore/api.json" .
-./gen-client.sh "api.json" "certguard" ruby "pulp_certguard"
-# -------------
+./gen-client.sh "../pulpcore/certguard-api.json" "certguard" ruby "pulp_certguard"
 
 pushd pulp_certguard-client
 gem build pulp_certguard_client
diff --git a/docs/template_gitref b/docs/template_gitref
index 3afe71998c..3d9674dcd0 100644
--- a/docs/template_gitref
+++ b/docs/template_gitref
@@ -1 +1 @@
-2021.08.26-359-gdd9cdf7
+2021.08.26-361-gcd6f9f0