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

Change workdir even if the immediate task fails #6294

Merged
merged 1 commit into from
Feb 24, 2025

Conversation

git-hyagi
Copy link
Contributor

fixes: #6293

@mdellweg mdellweg enabled auto-merge (rebase) February 24, 2025 13:07
@mdellweg
Copy link
Member

Thank you!

@mdellweg mdellweg merged commit 703333d into pulp:main Feb 24, 2025
12 checks passed
Copy link

patchback bot commented Feb 24, 2025

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

❌ Failed to cleanly apply 703333d on top of patchback/backports/3.71/703333dc12d0d4eb1ea4f02e7713e7a9fec728d9/pr-6294

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Restore workdir with try finally for immediate tasks
2 participants