diff --git a/.github/template_gitref b/.github/template_gitref index a743dd7f9..4fb36e960 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-385-g17472a1 +2021.08.26-387-ge627e91 diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 90a752cab..f56eb6de9 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -46,12 +46,14 @@ pushd ../pulp-openapi-generator # Workaround: Domains are not supported by the published bindings. # Sadly: Different pulpcore-versions aren't either... - # So we exclude the prebuilt ones only for domains disabled. - if [ "$(jq -r '.domain_enabled' <<<"${REPORTED_STATUS}")" = "true" ] || [ "$(jq -r '.online_workers[0].pulp_href|startswith("/pulp/api/v3/")' <<< "${REPORTED_STATUS}")" = "false" ] + # * In the 'pulp' scenario we use the published/prebuilt bindings, so we can test it. + # * In other scenarios we generate new bindings from server spec, so we have a more + # reliable client. + if [ "$TEST" = "pulp" ] then - BUILT_CLIENTS="" - else BUILT_CLIENTS=" rpm " + else + BUILT_CLIENTS="" fi for ITEM in $(jq -r '.versions[] | tojson' <<<"${REPORTED_STATUS}") diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index a3b85cf36..ac7f138ad 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -87,28 +87,6 @@ jobs: branch: "update-ci/3.27" base: "3.27" delete-branch: true - - uses: "actions/checkout@v4" - with: - fetch-depth: 0 - path: "pulp_rpm" - ref: "3.18" - - - name: "Run update" - working-directory: "pulp_rpm" - run: | - ../plugin_template/scripts/update_ci.sh --release - - - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v6" - with: - token: "${{ secrets.RELEASE_TOKEN }}" - path: "pulp_rpm" - committer: "pulpbot " - author: "pulpbot " - title: "Update CI files for branch 3.18" - branch: "update-ci/3.18" - base: "3.18" - delete-branch: true - uses: "actions/checkout@v4" with: fetch-depth: 0 diff --git a/MANIFEST.in b/MANIFEST.in index c202f32dd..9402d5f95 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,3 +11,4 @@ include pyproject.toml include requirements.txt include test_requirements.txt include unittest_requirements.txt +exclude releasing.md diff --git a/releasing.md b/releasing.md new file mode 100644 index 000000000..6c4d72529 --- /dev/null +++ b/releasing.md @@ -0,0 +1,27 @@ +[//]: # "WARNING: DO NOT EDIT!" +[//]: # "" +[//]: # "This file was generated by plugin_template, and is managed by it. Please use" +[//]: # "'./plugin-template --github pulp_rpm' to update this file." +[//]: # "" +[//]: # "For more info visit https://github.com/pulp/plugin_template" +# Releasing (For Internal Use) + +This document outlines the steps to perform a release. + +### Determine if a Release is Required +- Run the release checker script: + ``` + python3 .ci/scripts/check_release.py + ``` + +### Create a New Y-branch (e.g., 3.23) +- If a new minor version (Y) is needed, trigger a [Create New Release Branch](https://github.com/pulp/pulp_rpm/actions/workflows/create-branch.yml) job via the GitHub Actions. +- Look for the "Bump minor version" pull request and merge it. + +### Release a New Z-version (Patch Release) (e.g., 3.23.1, 3.22.12) +- Trigger a [Release Pipeline](https://github.com/pulp/pulp_rpm/actions/workflows/release.yml) job by specifying the release branch (X.Y) via the GitHub Actions. + +### Final Steps (Optional but Recommended) +- Ensure the new version appears on PyPI. +- Verify that the changelog has been updated by looking for the "Update Changelog" pull request. +- Post a brief announcement about the new release on the [Pulp Discourse](https://discourse.pulpproject.org/).