From 31c5a1df87e05a4b46a5c513e9d57b65b2dcca5f Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 19 May 2024 02:39:48 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/publish.yml | 10 +++++++--- .github/workflows/scripts/publish_client_pypi.sh | 10 ++++------ docs/template_gitref | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index 53d156174..d3966ad3e 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-331-ga8209e4 +2021.08.26-333-gdf1d3ba diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 81ca94db2..e112f554b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -88,11 +88,13 @@ jobs: run: | .github/workflows/scripts/install_ruby_client.sh shell: "bash" + - name: "Upload python client packages" uses: "actions/upload-artifact@v4" with: name: "python-client.tar" - path: "pulp_container/container-python-client.tar" + path: | + pulp_container/container-python-client.tar if-no-files-found: "error" overwrite: true @@ -100,14 +102,16 @@ jobs: uses: "actions/upload-artifact@v4" with: name: "python-client-docs.tar" - path: "pulp_container/container-python-client-docs.tar" + path: | + pulp_container/container-python-client-docs.tar if-no-files-found: "error" overwrite: true - name: "Upload ruby client packages" uses: "actions/upload-artifact@v4" with: name: "ruby-client.tar" - path: "pulp_container/container-ruby-client.tar" + path: | + pulp_container/container-ruby-client.tar if-no-files-found: "error" overwrite: true - name: Build docs diff --git a/.github/workflows/scripts/publish_client_pypi.sh b/.github/workflows/scripts/publish_client_pypi.sh index f4d6e910d..f3509a61d 100755 --- a/.github/workflows/scripts/publish_client_pypi.sh +++ b/.github/workflows/scripts/publish_client_pypi.sh @@ -24,10 +24,8 @@ RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https:/ if [ "$RESPONSE" == "200" ]; then echo "pulp_container client $VERSION has already been released. Skipping." - exit +else + twine upload -u __token__ -p "$PYPI_API_TOKEN" \ + "dist/pulp_container_client-$VERSION-py3-none-any.whl" \ + "dist/pulp_container-client-$VERSION.tar.gz" fi - -twine upload -u __token__ -p "$PYPI_API_TOKEN" \ -"dist/pulp_container_client-$VERSION-py3-none-any.whl" \ -"dist/pulp_container-client-$VERSION.tar.gz" \ -; diff --git a/docs/template_gitref b/docs/template_gitref index 53d156174..d3966ad3e 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-331-ga8209e4 +2021.08.26-333-gdf1d3ba