Merge pull request #4687 from tonistiigi/labs-ci-fix

dockerfile2llb: fix ci merge conflict
moby · Feb 24, 2024 · 596ef8f · 596ef8f
2 parents c45d02f + d9ed39a
commit 596ef8f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go b/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go
@@ -14,14 +14,14 @@ func TestDockerfileCopyExcludePatterns(t *testing.T) {
 	df := `FROM scratch
 COPY --exclude=src/*.go --exclude=tmp/*.txt dir /sub/
 `
-	_, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
+	_, _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
 	assert.NoError(t, err)
 }
 
 func TestDockerfileAddExcludePatterns(t *testing.T) {
 	df := `FROM scratch
 ADD --exclude=src/*.go --exclude=tmp/*.txt dir /sub/
 `
-	_, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
+	_, _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
 	assert.NoError(t, err)
 }