Skip to content

Conversation

glours
Copy link
Contributor

@glours glours commented Jan 7, 2025

No description provided.

@glours glours requested a review from a team January 7, 2025 15:11
@glours glours self-assigned this Jan 7, 2025
@crazy-max
Copy link
Member

crazy-max commented Jan 7, 2025

Seems something has changed with path handling?: https://github.com/docker/buildx/actions/runs/12653947166/job/35260624934?pr=2893#step:6:1351

 === Failed
=== FAIL: bake TestParseCompose (0.01s)
    compose_test.go:80: 
        	Error Trace:	D:/a/buildx/buildx/bake/compose_test.go:80
        	Error:      	Not equal: 
        	            	expected: []string{"default", "key=path/to/key"}
        	            	actual  : []string{"default", "key=path\\to\\key"}
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -2,3 +2,3 @@
        	            	  (string) (len=7) "default",
        	            	- (string) (len=15) "key=path/to/key"
        	            	+ (string) (len=15) "key=path\\to\\key"
        	            	 }
        	Test:       	TestParseCompose

=== FAIL: bake TestComposeExt (0.01s)
    compose_test.go:341: 
        	Error Trace:	D:/a/buildx/buildx/bake/compose_test.go:341
        	Error:      	Not equal: 
        	            	expected: []string{"default", "key=path/to/key", "other=path/to/otherkey"}
        	            	actual  : []string{"default", "key=path\\to\\key", "other=path/to/otherkey"}
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -2,3 +2,3 @@
        	            	  (string) (len=7) "default",
        	            	- (string) (len=15) "key=path/to/key",
        	            	+ (string) (len=15) "key=path\\to\\key",
        	            	  (string) (len=22) "other=path/to/otherkey"
        	Test:       	TestComposeExt

glours added 2 commits January 8, 2025 11:57
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
the unit test doesn't define a working_dir so path generate on Windows is escaped
this use case is already covered and tested by compose-go CI

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
@glours glours force-pushed the bump-compose-go-v2.4.7 branch from b477dfd to e762d3d Compare January 8, 2025 10:57
Copy link
Member

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

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

LGTM thanks!

About test change I will take a look if we can define the working dir when parsing the compose file as follow-up but I'm pretty sure this will break remote bake definition with local context handling.

@crazy-max crazy-max merged commit f3f5e76 into docker:master Jan 8, 2025
124 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants