Skip to content

bump compose-go to fix multiple compose files merge issues#11416

Merged
glours merged 1 commit intodocker:mainfrom
glours:fix-merge-compose-go-issue
Jan 29, 2024
Merged

bump compose-go to fix multiple compose files merge issues#11416
glours merged 1 commit intodocker:mainfrom
glours:fix-merge-compose-go-issue

Conversation

@glours
Copy link
Contributor

@glours glours commented Jan 26, 2024

What I did
Use version v2.0.0-rc3 of compose-go which fixes many of the merge issues coming from compose-go/v2 dependency

Related issue

(not mandatory) A picture of a cute animal, if possible in relation to what you did
image

@codecov
Copy link

codecov bot commented Jan 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (25d16d1) 56.57% compared to head (71bebc1) 56.49%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #11416      +/-   ##
==========================================
- Coverage   56.57%   56.49%   -0.08%     
==========================================
  Files         136      136              
  Lines       11544    11544              
==========================================
- Hits         6531     6522       -9     
- Misses       4388     4394       +6     
- Partials      625      628       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@glours glours force-pushed the fix-merge-compose-go-issue branch from 13fdeb3 to 553a34b Compare January 26, 2024 13:33
…ge issues

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
@glours glours force-pushed the fix-merge-compose-go-issue branch from 553a34b to 71bebc1 Compare January 29, 2024 14:27
@glours glours marked this pull request as ready for review January 29, 2024 14:28
@glours glours self-assigned this Jan 29, 2024
@glours glours requested review from a team, jhrotko, milas and ndeloof and removed request for a team January 29, 2024 14:28
@glours glours added the dependencies Pull requests that update a dependency file label Jan 29, 2024
@glours glours merged commit a9cbb0f into docker:main Jan 29, 2024
@glours glours deleted the fix-merge-compose-go-issue branch June 30, 2025 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants