Skip to content

fix(dockercompose): add compose*.y*ml to defaultFilePattern#7845

Merged
olblak merged 6 commits intoupdatecli:mainfrom
qianlongzt:main
Mar 1, 2026
Merged

fix(dockercompose): add compose*.y*ml to defaultFilePattern#7845
olblak merged 6 commits intoupdatecli:mainfrom
qianlongzt:main

Conversation

@qianlongzt
Copy link
Copy Markdown
Contributor

@qianlongzt qianlongzt commented Feb 28, 2026

fix: #7844

and remove leading * since not necesssry

Test

To test this pull request, you can run the following commands:

cd pkg/plugins/autodiscovery/dockercompose
go test

Additional Information

Checklist

  • I have updated the documentation via pull request in website repository.

Tradeoff

Potential improvement

olblak
olblak previously approved these changes Feb 28, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@olblak olblak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix

@olblak olblak added bug Something isn't working autodiscovery All things related to the autodiscovery feature docker-compose labels Feb 28, 2026
@olblak olblak enabled auto-merge (squash) February 28, 2026 17:07
@olblak
Copy link
Copy Markdown
Member

olblak commented Feb 28, 2026

Looking at the failing test, could you sort the array in the test?

auto-merge was automatically disabled March 1, 2026 05:34

Head branch was pushed to by a user without write access

@qianlongzt
Copy link
Copy Markdown
Contributor Author

qianlongzt commented Mar 1, 2026

Sorry for that. I tested it on Windows; I thought it was okay before.

image

@olblak
Copy link
Copy Markdown
Member

olblak commented Mar 1, 2026

Sorry for that. I tested it on Windows; I thought it was okay before.
In this case the files weren't ordered deterministically, that's why the test was sorted correctly on your machine but not in the CI. Also this kind of issues can be annoying to detect because by default the test results are cached

olblak
olblak approved these changes Mar 1, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@olblak olblak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix

@olblak olblak enabled auto-merge (squash) March 1, 2026 10:34
@qianlongzt
Copy link
Copy Markdown
Contributor Author

qianlongzt commented Mar 1, 2026

I don’t know what caused the CI failure?

Testcase "Test updatecli pipeline diff shouldn't fail", step #1-0: Assertion "result.systemout ShouldNotContainSubstring "WARNING:"" failed. expected '~/work/updatecli/updatecli ~/work/updatecli/updatecli/e2e/venom.d

@olblak
Copy link
Copy Markdown
Member

olblak commented Mar 1, 2026

More than probably some GitHub Api limite reached nothing important

@olblak olblak merged commit 31abd1c into updatecli:main Mar 1, 2026
5 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@olblak olblak olblak approved these changes

Assignees

No one assigned

Labels

autodiscovery All things related to the autodiscovery feature bug Something isn't working docker-compose

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Feature Request: Docker Compose supports compose.yaml as a valid default filename.

2 participants

@qianlongzt @olblak