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

Patchback checker debug #2483

Merged
merged 2 commits into from
Jan 22, 2025

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Jan 22, 2025

SUMMARY

add some debugging - I've tried debugging this against my fork, but something's not quite right

ISSUE TYPE
COMPONENT NAME
ADDITIONAL INFORMATION

@tremble tremble requested a review from alinabuzachis January 22, 2025 08:59
@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label Jan 22, 2025
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/e52c584265ee419d80950b64f7f3c5fb

✔️ ansible-galaxy-importer SUCCESS in 5m 23s
✔️ build-ansible-collection SUCCESS in 10m 08s

Copy link
Contributor

Pull request merge failed: Resource not accessible by integration, You may need to manually rebase your PR and retry.

@tremble tremble merged commit 9c3448f into ansible-collections:main Jan 22, 2025
48 of 49 checks passed
Copy link

patchback bot commented Jan 22, 2025

Backport to stable-9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 9c3448f on top of patchback/backports/stable-9/9c3448fe98a61596a9a83aa38564e5bc2ad59461/pr-2483

Backporting merged PR #2483 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/ansible-collections/amazon.aws.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/stable-9/9c3448fe98a61596a9a83aa38564e5bc2ad59461/pr-2483 upstream/stable-9
  4. Now, cherry-pick PR Patchback checker debug #2483 contents into that branch:
    $ git cherry-pick -x 9c3448fe98a61596a9a83aa38564e5bc2ad59461
    If it'll yell at you with something like fatal: Commit 9c3448fe98a61596a9a83aa38564e5bc2ad59461 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 9c3448fe98a61596a9a83aa38564e5bc2ad59461
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Patchback checker debug #2483 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-9/9c3448fe98a61596a9a83aa38564e5bc2ad59461/pr-2483
  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
backport-9 mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants