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

Move special ci dependencies in the proper place #332

Closed mdellweg closed 10 months ago

mdellweg commented 10 months ago

Make use of ci_requirements.txt to install python-dateutil and rhsm. There is no good reason to add an extra codepath to the plugin-template for this.

[noissue]

(cherry picked from commit a0028564b26c97fccb741b24f188ac2743a7c119)

patchback[bot] commented 10 months ago

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

❌ Failed to cleanly apply 4f6301c15cff148853c8386aa4713edbc326b748 on top of patchback/backports/1.5/4f6301c15cff148853c8386aa4713edbc326b748/pr-332

Backporting merged PR #332 into 1.6

  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.5/4f6301c15cff148853c8386aa4713edbc326b748/pr-332 upstream/1.5
  4. Now, cherry-pick PR #332 contents into that branch:
    $ git cherry-pick -x 4f6301c15cff148853c8386aa4713edbc326b748

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

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