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_compose_v2: fix tests #1027

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

docker-compose 2.32.2 has been released, which contains docker/compose#12442. That PR stops image building from emitting "building" events, which no longer triggers a "changed" result in one case.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

docker_compose_v2

@felixfontein felixfontein added the backport-3 Automatically create a backport for the stable-3 branch label Jan 14, 2025
@felixfontein felixfontein merged commit 9e26c47 into ansible-collections:main Jan 14, 2025
82 checks passed
Copy link
Contributor

patchback bot commented Jan 14, 2025

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

❌ Failed to cleanly apply 9e26c47 on top of patchback/backports/stable-3/9e26c4794e867ed7ca077febebfcdddb1d9e0561/pr-1027

Backporting merged PR #1027 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-3/9e26c4794e867ed7ca077febebfcdddb1d9e0561/pr-1027 upstream/stable-3
  4. Now, cherry-pick PR docker_compose_v2: fix tests #1027 contents into that branch:
    $ git cherry-pick -x 9e26c4794e867ed7ca077febebfcdddb1d9e0561
    If it'll yell at you with something like fatal: Commit 9e26c4794e867ed7ca077febebfcdddb1d9e0561 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 9e26c4794e867ed7ca077febebfcdddb1d9e0561
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR docker_compose_v2: fix tests #1027 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-3/9e26c4794e867ed7ca077febebfcdddb1d9e0561/pr-1027
  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 tests branch January 14, 2025 20:17
felixfontein added a commit that referenced this pull request Jan 14, 2025
* Since docker-compose 2.32.2 present_3 is no longer changed.

This has been caused by docker/compose#12442,
since that PR removes the "building" event.

* Remove deprecated 'version' fields.

(cherry picked from commit 9e26c47)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3 Automatically create a backport for the stable-3 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant