Skip to content

Conversation

@gerrod3
Copy link
Contributor

@gerrod3 gerrod3 commented Aug 12, 2025

No description provided.

@gerrod3 gerrod3 merged commit ae16f6a into pulp:main Aug 12, 2025
13 checks passed
@patchback
Copy link

patchback bot commented Aug 12, 2025

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

❌ Failed to cleanly apply ae16f6a on top of patchback/backports/3.17/ae16f6a7f6ec106fea10c38b9d81551cc3c7c5ec/pr-931

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

@gerrod3 gerrod3 deleted the group-upload-task-fix branch August 12, 2025 19:13
gerrod3 added a commit to gerrod3/pulp_python that referenced this pull request Aug 12, 2025
Fixed group uploads failing when using domains

(cherry picked from commit ae16f6a)
gerrod3 added a commit that referenced this pull request Aug 12, 2025
…7f6ec106fea10c38b9d81551cc3c7c5ec/pr-931

Merge pull request #931 from gerrod3/group-upload-task-fix
@gerrod3 gerrod3 linked an issue Aug 12, 2025 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

PYTHON_GROUP_UPLOADS leads to Internal Errors when uploading wheels

2 participants