Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ci tests #906

Merged
merged 2 commits into from
Oct 2, 2023

Make import tests agnostic to .tar vs .tar.gz

72362c3
Select commit
Loading
Failed to load commit list.
Merged

Fix ci tests #906

Make import tests agnostic to .tar vs .tar.gz
72362c3
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 2.21 completed Oct 16, 2023 in 3s

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

❌ Failed to cleanly apply 1d887ea on top of patchback/backports/2.21/1d887ea2ea22b91b67d1c09db2bc6c3ce2897454/pr-906

Details

Backporting merged PR #906 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_deb.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/2.21/1d887ea2ea22b91b67d1c09db2bc6c3ce2897454/pr-906 upstream/2.21
  4. Now, cherry-pick PR #906 contents into that branch:
    $ git cherry-pick -x 1d887ea2ea22b91b67d1c09db2bc6c3ce2897454
    If it'll yell at you with something like fatal: Commit 1d887ea2ea22b91b67d1c09db2bc6c3ce2897454 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1d887ea2ea22b91b67d1c09db2bc6c3ce2897454
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR #906 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.21/1d887ea2ea22b91b67d1c09db2bc6c3ce2897454/pr-906
  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!