diff --git a/.github/template_gitref b/.github/template_gitref index 2232d65..0935411 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-330-g0b7d0c1 +2021.08.26-335-gdf91f79 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 520e110..3e99613 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,3 +42,4 @@ jobs: path: "pulp_gem/dist/" if-no-files-found: "error" retention-days: 5 + overwrite: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f37f365..cca7bb3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -88,25 +88,32 @@ 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_gem/gem-python-client.tar" + path: | + pulp_gem/gem-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: "pulp_gem/gem-python-client-docs.tar" + path: | + pulp_gem/gem-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_gem/gem-ruby-client.tar" + path: | + pulp_gem/gem-ruby-client.tar if-no-files-found: "error" + overwrite: true - name: Build docs run: | export DJANGO_SETTINGS_MODULE=pulpcore.app.settings @@ -119,6 +126,8 @@ jobs: with: name: "docs.tar" path: "pulp_gem/docs/docs.tar" + if-no-files-found: "error" + overwrite: true - name: "Logs" if: always() diff --git a/.github/workflows/scripts/publish_client_pypi.sh b/.github/workflows/scripts/publish_client_pypi.sh index c3e095e..3177557 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_gem client $VERSION has already been released. Skipping." - exit +else + twine upload -u __token__ -p "$PYPI_API_TOKEN" \ + "dist/pulp_gem_client-$VERSION-py3-none-any.whl" \ + "dist/pulp_gem-client-$VERSION.tar.gz" fi - -twine upload -u __token__ -p "$PYPI_API_TOKEN" \ -"dist/pulp_gem_client-$VERSION-py3-none-any.whl" \ -"dist/pulp_gem-client-$VERSION.tar.gz" \ -; diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0ae773c..4efe546 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -125,6 +125,7 @@ jobs: path: "pulp_gem/deprecations-${{ matrix.env.TEST }}.txt" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload python client packages if: ${{ env.TEST == 'pulp' }} uses: actions/upload-artifact@v4 @@ -133,6 +134,7 @@ jobs: path: "pulp_gem/gem-python-client.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload python client docs if: ${{ env.TEST == 'pulp' }} @@ -142,6 +144,7 @@ jobs: path: "pulp_gem/gem-python-client-docs.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload Ruby client if: ${{ env.TEST == 'pulp' }} uses: actions/upload-artifact@v4 @@ -150,12 +153,16 @@ jobs: path: "pulp_gem/gem-ruby-client.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload built docs if: ${{ env.TEST == 'docs' }} uses: actions/upload-artifact@v4 with: name: "docs.tar" path: "pulp_gem/docs/docs.tar" + if-no-files-found: "error" + retention-days: 5 + overwrite: true - name: "Logs" if: always() diff --git a/docs/template_gitref b/docs/template_gitref index 2232d65..0935411 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-330-g0b7d0c1 +2021.08.26-335-gdf91f79