Update CI files

[noissue]
pulp · May 22, 2024 · ff2a2a3 · ff2a2a3
1 parent 455ce9a
commit ff2a2a3
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 57 deletions.
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-331-ga8209e4
+2021.08.26-335-gdf91f79
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -88,70 +88,36 @@ 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: "pulpcore/core-python-client.tar"
-          if-no-files-found: "error"
-          overwrite: true
 
-      - name: "Upload python client docs"
-        uses: "actions/upload-artifact@v4"
-        with:
-          name: "python-client-docs.tar"
-          path: "pulpcore/core-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: "pulpcore/core-ruby-client.tar"
-          if-no-files-found: "error"
-          overwrite: true
-      - name: "Upload python client packages"
-        uses: "actions/upload-artifact@v4"
-        with:
-          name: "python-client.tar"
-          path: "pulpcore/file-python-client.tar"
-          if-no-files-found: "error"
-          overwrite: true
-
-      - name: "Upload python client docs"
-        uses: "actions/upload-artifact@v4"
-        with:
-          name: "python-client-docs.tar"
-          path: "pulpcore/file-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: "pulpcore/file-ruby-client.tar"
-          if-no-files-found: "error"
-          overwrite: true
       - name: "Upload python client packages"
         uses: "actions/upload-artifact@v4"
         with:
           name: "python-client.tar"
-          path: "pulpcore/certguard-python-client.tar"
+          path: |
+            pulpcore/core-python-client.tar
+            pulpcore/file-python-client.tar
+            pulpcore/certguard-python-client.tar
           if-no-files-found: "error"
           overwrite: true
 
       - name: "Upload python client docs"
         uses: "actions/upload-artifact@v4"
         with:
           name: "python-client-docs.tar"
-          path: "pulpcore/certguard-python-client-docs.tar"
+          path: |
+            pulpcore/core-python-client-docs.tar
+            pulpcore/file-python-client-docs.tar
+            pulpcore/certguard-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: "pulpcore/certguard-ruby-client.tar"
+          path: |
+            pulpcore/core-ruby-client.tar
+            pulpcore/file-ruby-client.tar
+            pulpcore/certguard-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
@@ -24,14 +24,30 @@ RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https:/
 if [ "$RESPONSE" == "200" ];
 then
   echo "pulpcore client $VERSION has already been released. Skipping."
-  exit
+else
+  twine upload -u __token__ -p "$PYPI_API_TOKEN" \
+  "dist/pulpcore_client-$VERSION-py3-none-any.whl" \
+  "dist/pulpcore-client-$VERSION.tar.gz"
 fi
 
-twine upload -u __token__ -p "$PYPI_API_TOKEN" \
-"dist/pulpcore_client-$VERSION-py3-none-any.whl" \
-"dist/pulpcore-client-$VERSION.tar.gz" \
-"dist/pulp_file_client-$VERSION-py3-none-any.whl" \
-"dist/pulp_file-client-$VERSION.tar.gz" \
-"dist/pulp_certguard_client-$VERSION-py3-none-any.whl" \
-"dist/pulp_certguard-client-$VERSION.tar.gz" \
-;
+RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https://pypi.org/project/pulp-file-client/$VERSION/")"
+
+if [ "$RESPONSE" == "200" ];
+then
+  echo "pulp_file client $VERSION has already been released. Skipping."
+else
+  twine upload -u __token__ -p "$PYPI_API_TOKEN" \
+  "dist/pulp_file_client-$VERSION-py3-none-any.whl" \
+  "dist/pulp_file-client-$VERSION.tar.gz"
+fi
+
+RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https://pypi.org/project/pulp-certguard-client/$VERSION/")"
+
+if [ "$RESPONSE" == "200" ];
+then
+  echo "pulp-certguard client $VERSION has already been released. Skipping."
+else
+  twine upload -u __token__ -p "$PYPI_API_TOKEN" \
+  "dist/pulp_certguard_client-$VERSION-py3-none-any.whl" \
+  "dist/pulp_certguard-client-$VERSION.tar.gz"
+fi
diff --git a/docs/template_gitref b/docs/template_gitref
@@ -1 +1 @@
-2021.08.26-331-ga8209e4
+2021.08.26-335-gdf91f79