pulp / pulp-certguard

Pulp plugin that provides an x.509 certificate based content-guard.
GNU General Public License v2.0
3 stars 26 forks source link

Bumped compatibility for pulpcore 3.44 #305

Closed mdellweg closed 11 months ago

mdellweg commented 11 months ago

This is intentionally not bumping to 3.54 right now, so we have the chance to merge the codebase of this plugin with pulpcore in 3.45.

[noissue]

patchback[bot] commented 11 months ago

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

❌ Failed to cleanly apply 76be83777a964e9e92adbddfe90ef74b6fce079b on top of patchback/backports/1.6/76be83777a964e9e92adbddfe90ef74b6fce079b/pr-305

Backporting merged PR #305 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-certguard.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/1.6/76be83777a964e9e92adbddfe90ef74b6fce079b/pr-305 upstream/1.6
  4. Now, cherry-pick PR #305 contents into that branch:
    $ git cherry-pick -x 76be83777a964e9e92adbddfe90ef74b6fce079b

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

    $ git cherry-pick -m1 -x 76be83777a964e9e92adbddfe90ef74b6fce079b
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #305 as close to the original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/1.6/76be83777a964e9e92adbddfe90ef74b6fce079b/pr-305
  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.