pulp / pulp-cli

https://docs.pulpproject.org/pulp_cli/
GNU General Public License v2.0
33 stars 41 forks source link

Don't test docs on release branches #997

Closed mdellweg closed 1 week ago

mdellweg commented 2 weeks ago

Review Checklist:

patchback[bot] commented 1 week ago

Backport to 0.25: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 4774b6717fcaadd3d46744800e8ddc510faddaae on top of patchback/backports/0.25/4774b6717fcaadd3d46744800e8ddc510faddaae/pr-997

Backporting merged PR #997 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these instructions you'll refer to it by the name upstream. If you don't have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulp-cli.git
  3. Ensure you have the latest copy of upstream and prepare a branch that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/0.25/4774b6717fcaadd3d46744800e8ddc510faddaae/pr-997 upstream/0.25
  4. Now, cherry-pick PR #997 contents into that branch:
    $ git cherry-pick -x 4774b6717fcaadd3d46744800e8ddc510faddaae

    If it'll yell at you with something like fatal: Commit 4774b6717fcaadd3d46744800e8ddc510faddaae is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x 4774b6717fcaadd3d46744800e8ddc510faddaae
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #997 as close to the original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/0.25/4774b6717fcaadd3d46744800e8ddc510faddaae/pr-997
  7. Create a PR, ensure that the CI is green. If it's not — update it so that the tests and any other checks pass. This is it! Now relax and wait for the maintainers to process your pull request when they have some cycles to do reviews. Don't worry — they'll tell you if any improvements are necessary when the time comes!

🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.