pulp / pulp_rpm

RPM support for Pulp Platform
https://docs.pulpproject.org/pulp_rpm/
GNU General Public License v2.0
47 stars 123 forks source link

Allow core/<3.70. #3627

Closed ggainey closed 1 week ago

ggainey commented 1 week ago

fixes #3620.

(cherry picked from commit 1c36b39e2be24f87a97821370ee850cafefddbe6)

patchback[bot] commented 9 hours ago

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

❌ Failed to cleanly apply e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8 on top of patchback/backports/3.26/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627

Backporting merged PR #3627 into 3.26

  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_rpm.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/3.26/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627 upstream/3.26
  4. Now, cherry-pick PR #3627 contents into that branch:
    $ git cherry-pick -x e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8

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

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

patchback[bot] commented 9 hours ago

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

❌ Failed to cleanly apply e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8 on top of patchback/backports/3.25/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627

Backporting merged PR #3627 into 3.26

  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_rpm.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/3.25/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627 upstream/3.25
  4. Now, cherry-pick PR #3627 contents into that branch:
    $ git cherry-pick -x e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8

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

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