From 03b8caf66e0684d6e741d3adfcc9fbfddca4e246 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Mon, 13 May 2024 11:51:47 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/build.yml | 5 +-- .github/workflows/changelog.yml | 2 +- .github/workflows/ci.yml | 7 ++-- .github/workflows/create-branch.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/nightly.yml | 10 +++--- .github/workflows/publish.yml | 51 ++++++++++++++++++----------- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 41 +++++++++++++++-------- .github/workflows/update-labels.yml | 2 +- .github/workflows/update_ci.yml | 2 +- docs/conf.py | 5 +++ docs/template_gitref | 2 +- 14 files changed, 83 insertions(+), 52 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index 2f00223c71..53d1561745 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-328-g59a6718 +2021.08.26-331-ga8209e4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a781c24fc..080d2b7a9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 1 path: "pulpcore" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" - name: "Install python dependencies" @@ -36,9 +36,10 @@ jobs: python3 setup.py sdist bdist_wheel --python-tag py3 twine check dist/* - name: "Upload Package whl" - uses: "actions/upload-artifact@v3" + uses: "actions/upload-artifact@v4" with: name: "plugin_package" path: "pulpcore/dist/" if-no-files-found: "error" retention-days: 5 + overwrite: true diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 7029c528b7..34601cfd65 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -28,7 +28,7 @@ jobs: with: fetch-depth: 1 - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a8bc29495..c2f1f1a518 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" - name: "Install python dependencies" @@ -67,10 +67,11 @@ jobs: mkdir -p "pulpcore" working-directory: "." - name: "Download Deprecations" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: "deprecations" + pattern: "deprecations-*" path: "pulpcore" + merge-multiple: true - name: "Print deprecations" run: | cat deprecations-*.txt | sort -u diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index c429ed426b..a1b904249e 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -26,7 +26,7 @@ jobs: fetch-depth: 0 path: "pulpcore" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 97c98b2447..c5490bbe7a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 1 path: "pulpcore" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0c0db1e28d..3262f43910 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -38,7 +38,7 @@ jobs: fetch-depth: 0 path: "pulpcore" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" @@ -76,12 +76,12 @@ jobs: fetch-depth: 1 path: "pulpcore" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: "plugin_package" path: "pulpcore/dist/" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" @@ -96,13 +96,13 @@ jobs: echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV - name: Download built docs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: "docs.tar" path: "pulpcore" - name: Download Python client docs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: "python-client-docs.tar" path: "pulpcore" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ca6579e275..fa8b7cb491 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -39,11 +39,11 @@ jobs: repository: "pulp/pulp-openapi-generator" path: "pulp-openapi-generator" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" - - uses: "actions/download-artifact@v3" + - uses: "actions/download-artifact@v4" with: name: "plugin_package" path: "pulpcore/dist/" @@ -89,62 +89,71 @@ jobs: .github/workflows/scripts/install_ruby_client.sh shell: "bash" - name: "Upload python client packages" - uses: "actions/upload-artifact@v3" + 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@v3" + 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@v3" + 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@v3" + 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@v3" + 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@v3" + 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@v3" + uses: "actions/upload-artifact@v4" with: name: "python-client.tar" path: "pulpcore/certguard-python-client.tar" if-no-files-found: "error" + overwrite: true - name: "Upload python client docs" - uses: "actions/upload-artifact@v3" + uses: "actions/upload-artifact@v4" with: name: "python-client-docs.tar" path: "pulpcore/certguard-python-client-docs.tar" if-no-files-found: "error" + overwrite: true - name: "Upload ruby client packages" - uses: "actions/upload-artifact@v3" + uses: "actions/upload-artifact@v4" with: name: "ruby-client.tar" path: "pulpcore/certguard-ruby-client.tar" if-no-files-found: "error" + overwrite: true - name: Build docs run: | export DJANGO_SETTINGS_MODULE=pulpcore.app.settings @@ -153,10 +162,12 @@ jobs: tar -cvf docs/docs.tar docs/_build - name: "Upload built docs" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "docs.tar" path: "pulpcore/docs/docs.tar" + if-no-files-found: "error" + overwrite: true - name: "Logs" if: always() @@ -183,12 +194,12 @@ jobs: fetch-depth: 1 path: "pulpcore" - - uses: "actions/download-artifact@v3" + - uses: "actions/download-artifact@v4" with: name: "plugin_package" path: "pulpcore/dist/" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" @@ -222,7 +233,7 @@ jobs: path: "pulpcore" - name: "Download Python client" - uses: "actions/download-artifact@v3" + uses: "actions/download-artifact@v4" with: name: "python-client.tar" path: "pulpcore/" @@ -233,7 +244,7 @@ jobs: tar -xvf file-python-client.tar tar -xvf certguard-python-client.tar - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" @@ -267,7 +278,7 @@ jobs: path: "pulpcore" - name: "Download Ruby client" - uses: "actions/download-artifact@v3" + uses: "actions/download-artifact@v4" with: name: "ruby-client.tar" path: "pulpcore/" @@ -305,7 +316,7 @@ jobs: fetch-depth: 1 path: "pulpcore" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" @@ -322,13 +333,13 @@ jobs: SECRETS_CONTEXT: "${{ toJson(secrets) }}" - name: "Download built docs" - uses: "actions/download-artifact@v3" + uses: "actions/download-artifact@v4" with: name: "docs.tar" path: "pulpcore/" - name: "Download Python client docs" - uses: "actions/download-artifact@v3" + uses: "actions/download-artifact@v4" with: name: "python-client-docs.tar" path: "pulpcore/" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9aa32617c3..593ec2f4a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: path: "pulpcore" token: ${{ secrets.RELEASE_TOKEN }} - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eaf0dc4f9a..dd9fc5cf69 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,11 +39,11 @@ jobs: repository: "pulp/pulp-openapi-generator" path: "pulp-openapi-generator" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" - - uses: "actions/download-artifact@v3" + - uses: "actions/download-artifact@v4" with: name: "plugin_package" path: "pulpcore/dist/" @@ -119,93 +119,106 @@ jobs: docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-${{ matrix.env.TEST }}.txt - name: "Upload Deprecations" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: "deprecations" + name: "deprecations-${{ matrix.env.TEST }}" path: "pulpcore/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@v3 + uses: actions/upload-artifact@v4 with: name: "python-client.tar" path: "pulpcore/core-python-client.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload python client docs if: ${{ env.TEST == 'pulp' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "python-client-docs.tar" path: "pulpcore/core-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@v3 + uses: actions/upload-artifact@v4 with: name: "ruby-client.tar" path: "pulpcore/core-ruby-client.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload python client packages if: ${{ env.TEST == 'pulp' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "python-client.tar" path: "pulpcore/file-python-client.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload python client docs if: ${{ env.TEST == 'pulp' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "python-client-docs.tar" path: "pulpcore/file-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@v3 + uses: actions/upload-artifact@v4 with: name: "ruby-client.tar" path: "pulpcore/file-ruby-client.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload python client packages if: ${{ env.TEST == 'pulp' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "python-client.tar" path: "pulpcore/certguard-python-client.tar" if-no-files-found: "error" retention-days: 5 + overwrite: true - name: Upload python client docs if: ${{ env.TEST == 'pulp' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "python-client-docs.tar" path: "pulpcore/certguard-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@v3 + uses: actions/upload-artifact@v4 with: name: "ruby-client.tar" path: "pulpcore/certguard-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@v3 + uses: actions/upload-artifact@v4 with: name: "docs.tar" path: "pulpcore/docs/docs.tar" + if-no-files-found: "error" + retention-days: 5 + overwrite: true - name: "Logs" if: always() diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml index 7cd4f79f26..112ca62147 100644 --- a/.github/workflows/update-labels.yml +++ b/.github/workflows/update-labels.yml @@ -19,7 +19,7 @@ jobs: update_backport_labels: runs-on: "ubuntu-latest" steps: - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" - name: "Configure Git with pulpbot name and email" diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 7b8952ef21..c680eb30f6 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -29,7 +29,7 @@ jobs: repository: "pulp/plugin_template" path: "plugin_template" - - uses: "actions/setup-python@v4" + - uses: "actions/setup-python@v5" with: python-version: "3.11" diff --git a/docs/conf.py b/docs/conf.py index 895c2f4ceb..7d5a23a2d8 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -310,3 +310,8 @@ def find_obj(self, env, modname, classname, name, type, searchmode=0): def setup(sphinx): """Use MyPythonDomain in place of PythonDomain""" sphinx.add_domain(MyPythonDomain, override=True) + +rst_prolog = """.. attention:: + This documentation will be deactivated in the near future. `Learn More `_ + or go to the `New Pulp Docs `_ (beta). +""" diff --git a/docs/template_gitref b/docs/template_gitref index 2f00223c71..53d1561745 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-328-g59a6718 +2021.08.26-331-ga8209e4