From e53fd73824c1259cc025c62e38c11bc4ea4b01a0 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 7 Jul 2024 02:39:28 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/publish.yml | 137 +--------------- .../scripts/install_python_client.sh | 153 ------------------ .../workflows/scripts/install_ruby_client.sh | 72 --------- CHANGES/.TEMPLATE.rst | 47 ------ docs/template_gitref | 2 +- 6 files changed, 7 insertions(+), 406 deletions(-) delete mode 100755 .github/workflows/scripts/install_python_client.sh delete mode 100755 .github/workflows/scripts/install_ruby_client.sh delete mode 100644 CHANGES/.TEMPLATE.rst diff --git a/.github/template_gitref b/.github/template_gitref index 3d3d9afe45..19b4c781c0 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-347-gc4a2504 +2021.08.26-349-gba81617 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 84844433a3..717294e0b5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,137 +19,10 @@ defaults: jobs: build: uses: "./.github/workflows/build.yml" - - build-bindings-docs: - needs: - - "build" - runs-on: "ubuntu-latest" - # Install scripts expect TEST to be set, 'docs' is most appropriate even though we don't run tests - env: - TEST: "docs" - steps: - - uses: "actions/checkout@v4" - with: - fetch-depth: 1 - path: "pulpcore" - - - uses: "actions/checkout@v4" - with: - fetch-depth: 1 - repository: "pulp/pulp-openapi-generator" - path: "pulp-openapi-generator" - - - uses: "actions/setup-python@v5" - with: - python-version: "3.11" - - - uses: "actions/download-artifact@v4" - with: - name: "plugin_package" - path: "pulpcore/dist/" - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "2.6" - - - name: "Install python dependencies" - run: | - echo ::group::PYDEPS - pip install towncrier twine wheel httpie docker netaddr boto3 ansible mkdocs - echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulpcore/.ci/assets/httpie/" >> $GITHUB_ENV - echo ::endgroup:: - - # Building the bindings and docs requires accessing the OpenAPI specs endpoint, so we need to - # setup the Pulp instance. - - name: "Before Install" - run: | - .github/workflows/scripts/before_install.sh - shell: "bash" - env: - PY_COLORS: "1" - ANSIBLE_FORCE_COLOR: "1" - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" - - - name: "Install" - run: | - .github/workflows/scripts/install.sh - shell: "bash" - env: - PY_COLORS: "1" - ANSIBLE_FORCE_COLOR: "1" - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" - - - name: "Install Python client" - run: | - .github/workflows/scripts/install_python_client.sh - shell: "bash" - - name: "Install Ruby client" - 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 - 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/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/core-ruby-client.tar - pulpcore/file-ruby-client.tar - pulpcore/certguard-ruby-client.tar - if-no-files-found: "error" - overwrite: true - - name: Build docs - run: | - export DJANGO_SETTINGS_MODULE=pulpcore.app.settings - export PULP_SETTINGS=$PWD/.ci/ansible/settings/settings.py - make -C docs/ PULP_URL="https://pulp" diagrams html - tar -cvf docs/docs.tar docs/_build - - - name: "Upload built docs" - 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() - run: | - echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" - http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true - docker images || true - docker ps -a || true - docker logs pulp || true - docker exec pulp ls -latr /etc/yum.repos.d/ || true - docker exec pulp cat /etc/yum.repos.d/* || true - docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree" publish-package: runs-on: "ubuntu-latest" needs: - - "build-bindings-docs" + - "build" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" @@ -187,7 +60,7 @@ jobs: publish-python-bindings: runs-on: "ubuntu-latest" needs: - - "build-bindings-docs" + - "build" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" @@ -232,7 +105,7 @@ jobs: publish-ruby-bindings: runs-on: "ubuntu-latest" needs: - - "build-bindings-docs" + - "build" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" @@ -271,7 +144,7 @@ jobs: publish-docs: runs-on: "ubuntu-latest" needs: - - "build-bindings-docs" + - "build" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" @@ -318,7 +191,7 @@ jobs: create-gh-release: runs-on: "ubuntu-latest" needs: - - "build-bindings-docs" + - "build" - "publish-package" - "publish-python-bindings" - "publish-ruby-bindings" diff --git a/.github/workflows/scripts/install_python_client.sh b/.github/workflows/scripts/install_python_client.sh deleted file mode 100755 index f7bf4c37eb..0000000000 --- a/.github/workflows/scripts/install_python_client.sh +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulpcore' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -mveuo pipefail - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")"/../../.. - -source .github/workflows/scripts/utils.sh - -PULP_URL="${PULP_URL:-https://pulp}" -export PULP_URL -PULP_API_ROOT="${PULP_API_ROOT:-/pulp/}" -export PULP_API_ROOT - -REPORTED_STATUS="$(pulp status)" -REPORTED_VERSION="$(echo "$REPORTED_STATUS" | jq --arg plugin "core" -r '.versions[] | select(.component == $plugin) | .version')" -VERSION="$(echo "$REPORTED_VERSION" | python -c 'from packaging.version import Version; print(Version(input()))')" - -pushd ../pulp-openapi-generator -rm -rf pulpcore-client - -if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev" -then - curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=core" - USE_LOCAL_API_JSON=1 ./generate.sh pulpcore python "$VERSION" -else - ./generate.sh pulpcore python "$VERSION" -fi - -pushd pulpcore-client -python setup.py sdist bdist_wheel --python-tag py3 - -twine check "dist/pulpcore_client-$VERSION-py3-none-any.whl" -twine check "dist/pulpcore-client-$VERSION.tar.gz" - -cmd_prefix pip3 install "/root/pulp-openapi-generator/pulpcore-client/dist/pulpcore_client-${VERSION}-py3-none-any.whl" -tar cvf ../../pulpcore/core-python-client.tar ./dist - -find ./docs/* -exec sed -i 's/Back to README/Back to HOME/g' {} \; -find ./docs/* -exec sed -i 's/README//g' {} \; -cp README.md docs/index.md -sed -i 's/docs\///g' docs/index.md -find ./docs/* -exec sed -i 's/\.md//g' {} \; - -cat >> mkdocs.yml << DOCSYAML ---- -site_name: Pulpcore Client -site_description: Core bindings -site_author: Pulp Team -site_url: https://docs.pulpproject.org/pulpcore_client/ -repo_name: pulp/pulpcore -repo_url: https://github.com/pulp/pulpcore -theme: readthedocs -DOCSYAML - -# Building the bindings docs -mkdocs build - -# Pack the built site. -tar cvf ../../pulpcore/core-python-client-docs.tar ./site -popd -rm -rf pulp_file-client - -if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev" -then - curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=file" - USE_LOCAL_API_JSON=1 ./generate.sh pulp_file python "$VERSION" -else - ./generate.sh pulp_file python "$VERSION" -fi - -pushd pulp_file-client -python setup.py sdist bdist_wheel --python-tag py3 - -twine check "dist/pulp_file_client-$VERSION-py3-none-any.whl" -twine check "dist/pulp_file-client-$VERSION.tar.gz" - -cmd_prefix pip3 install "/root/pulp-openapi-generator/pulp_file-client/dist/pulp_file_client-${VERSION}-py3-none-any.whl" -tar cvf ../../pulpcore/file-python-client.tar ./dist - -find ./docs/* -exec sed -i 's/Back to README/Back to HOME/g' {} \; -find ./docs/* -exec sed -i 's/README//g' {} \; -cp README.md docs/index.md -sed -i 's/docs\///g' docs/index.md -find ./docs/* -exec sed -i 's/\.md//g' {} \; - -cat >> mkdocs.yml << DOCSYAML ---- -site_name: PulpFile Client -site_description: File bindings -site_author: Pulp Team -site_url: https://docs.pulpproject.org/pulp_file_client/ -repo_name: pulp/pulp_file -repo_url: https://github.com/pulp/pulp_file -theme: readthedocs -DOCSYAML - -# Building the bindings docs -mkdocs build - -# Pack the built site. -tar cvf ../../pulpcore/file-python-client-docs.tar ./site -popd -rm -rf pulp_certguard-client - -if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev" -then - curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=certguard" - USE_LOCAL_API_JSON=1 ./generate.sh pulp_certguard python "$VERSION" -else - ./generate.sh pulp_certguard python "$VERSION" -fi - -pushd pulp_certguard-client -python setup.py sdist bdist_wheel --python-tag py3 - -twine check "dist/pulp_certguard_client-$VERSION-py3-none-any.whl" -twine check "dist/pulp_certguard-client-$VERSION.tar.gz" - -cmd_prefix pip3 install "/root/pulp-openapi-generator/pulp_certguard-client/dist/pulp_certguard_client-${VERSION}-py3-none-any.whl" -tar cvf ../../pulpcore/certguard-python-client.tar ./dist - -find ./docs/* -exec sed -i 's/Back to README/Back to HOME/g' {} \; -find ./docs/* -exec sed -i 's/README//g' {} \; -cp README.md docs/index.md -sed -i 's/docs\///g' docs/index.md -find ./docs/* -exec sed -i 's/\.md//g' {} \; - -cat >> mkdocs.yml << DOCSYAML ---- -site_name: Pulp-Certguard Client -site_description: Certguard bindings -site_author: Pulp Team -site_url: https://docs.pulpproject.org/pulp_certguard_client/ -repo_name: pulp/pulp_certguard -repo_url: https://github.com/pulp/pulp_certguard -theme: readthedocs -DOCSYAML - -# Building the bindings docs -mkdocs build - -# Pack the built site. -tar cvf ../../pulpcore/certguard-python-client-docs.tar ./site -popd -popd diff --git a/.github/workflows/scripts/install_ruby_client.sh b/.github/workflows/scripts/install_ruby_client.sh deleted file mode 100755 index 1e33d6944c..0000000000 --- a/.github/workflows/scripts/install_ruby_client.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulpcore' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -mveuo pipefail - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")"/../../.. - -source .github/workflows/scripts/utils.sh - -PULP_URL="${PULP_URL:-https://pulp}" -export PULP_URL -PULP_API_ROOT="${PULP_API_ROOT:-/pulp/}" -export PULP_API_ROOT - -REPORTED_STATUS="$(pulp status)" -REPORTED_VERSION="$(echo "$REPORTED_STATUS" | jq --arg plugin "core" -r '.versions[] | select(.component == $plugin) | .version')" -VERSION="$(echo "$REPORTED_VERSION" | python -c 'from packaging.version import Version; print(Version(input()))')" - -pushd ../pulp-openapi-generator -rm -rf pulpcore-client - -if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev" -then - curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=core" - USE_LOCAL_API_JSON=1 ./generate.sh pulpcore ruby "$VERSION" -else - ./generate.sh pulpcore ruby "$VERSION" -fi - -pushd pulpcore-client -gem build pulpcore_client -gem install --both "./pulpcore_client-$VERSION.gem" -tar cvf ../../pulpcore/core-ruby-client.tar "./pulpcore_client-$VERSION.gem" -popd -rm -rf pulp_file-client - -if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev" -then - curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=file" - USE_LOCAL_API_JSON=1 ./generate.sh pulp_file ruby "$VERSION" -else - ./generate.sh pulp_file ruby "$VERSION" -fi - -pushd pulp_file-client -gem build pulp_file_client -gem install --both "./pulp_file_client-$VERSION.gem" -tar cvf ../../pulpcore/file-ruby-client.tar "./pulp_file_client-$VERSION.gem" -popd -rm -rf pulp_certguard-client - -if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev" -then - curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=certguard" - USE_LOCAL_API_JSON=1 ./generate.sh pulp_certguard ruby "$VERSION" -else - ./generate.sh pulp_certguard ruby "$VERSION" -fi - -pushd pulp_certguard-client -gem build pulp_certguard_client -gem install --both "./pulp_certguard_client-$VERSION.gem" -tar cvf ../../pulpcore/certguard-ruby-client.tar "./pulp_certguard_client-$VERSION.gem" -popd -popd diff --git a/CHANGES/.TEMPLATE.rst b/CHANGES/.TEMPLATE.rst deleted file mode 100644 index 49c2305d7b..0000000000 --- a/CHANGES/.TEMPLATE.rst +++ /dev/null @@ -1,47 +0,0 @@ -{% if render_title %} -{% if versiondata.name %} -{{ versiondata.name }} {{ versiondata.version }} ({{ versiondata.date }}) -{{ top_underline * ((versiondata.name + versiondata.version + versiondata.date)|length + 4)}} -{% else %} -{{ versiondata.version }} ({{ versiondata.date }}) -{{ top_underline * ((versiondata.version + versiondata.date)|length + 3)}} -{% endif %} -{% endif %} -{% for section, _ in sections.items() %} -{% set underline = underlines[0] %}{% if section %}{{section}} -{{ underline * section|length }}{% set underline = underlines[1] %} - -{% endif %} - -{% if sections[section] %} -{% for category, val in definitions.items() if category in sections[section]%} -{{ definitions[category]['name'] }} -{{ underline * definitions[category]['name']|length }} - -{% if definitions[category]['showcontent'] %} -{% for text, values in sections[section][category].items() %} -- {{ text }} - {{ values|join(',\n ') }} -{% endfor %} - -{% else %} -- {{ sections[section][category]['']|join(', ') }} - -{% endif %} -{% if sections[section][category]|length == 0 %} -No significant changes. - -{% else %} -{% endif %} - -{% endfor %} -{% else %} -No significant changes. - - -{% endif %} -{% endfor %} ----- - - - diff --git a/docs/template_gitref b/docs/template_gitref index 3d3d9afe45..19b4c781c0 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-347-gc4a2504 +2021.08.26-349-gba81617