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

docker_prune: correctly return 'changed' result #593

Merged
merged 3 commits into from
Feb 24, 2023

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Fixes #591.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

docker_prune

@felixfontein felixfontein merged commit 08bfcf7 into ansible-collections:main Feb 24, 2023
@patchback
Copy link
Contributor

patchback bot commented Feb 24, 2023

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

❌ Failed to cleanly apply 08bfcf7 on top of patchback/backports/stable-2/08bfcf7e5fbce8fe13583e6072b69a5a78253749/pr-593

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

@felixfontein felixfontein deleted the prune-changed branch February 24, 2023 16:24
@felixfontein
Copy link
Collaborator Author

@markuman @briantist thanks a lot for reviewing this!

felixfontein added a commit to felixfontein/community.docker that referenced this pull request Feb 24, 2023
)

* Correctly return 'changed' status.

* Extend tests.

* Fix typo.

(cherry picked from commit 08bfcf7)
felixfontein added a commit that referenced this pull request Feb 24, 2023
* Correctly return 'changed' status.

* Extend tests.

* Fix typo.

(cherry picked from commit 08bfcf7)
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.

docker_prune: filter "until" seems without effect
3 participants