Swap the platform flag too

yosifkit · yosifkit · commit d3dede4ffe8d · 2023-10-24T16:12:28.000-07:00
diff --git a/scripts/github-actions/munge-i386.sh b/scripts/github-actions/munge-i386.sh
@@ -21,6 +21,6 @@ jq --arg dpkgSmokeTest '[ "$(dpkg --print-architecture)" = "amd64" ]' '
 			)
 		] | join("\n"))
 		# adjust "docker buildx build" lines to include appropriate "--build-context" flags (https://github.com/docker/buildx/pull/1886)
-		| .runs.build |= gsub("docker buildx build "; "docker buildx build " + ($froms | unique | map(@sh "--build-context \(.)=docker-image://\("i386/" + .)") | join(" ")) + " ")
+		| .runs.build |= ( gsub("docker buildx build "; "docker buildx build " + ($froms | unique | map(@sh "--build-context \(.)=docker-image://\("i386/" + .)") | join(" ")) + " ") | gsub( "--platform[= ]linux/[^ ]+"; "--platform linux/386") )
 	]
 ' "$@"

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ jq --arg dpkgSmokeTest '[ "$(dpkg --print-architecture)" = "amd64" ]' '`
`21`	`21`	`)`
`22`	`22`	`] \| join("\n"))`
`23`	`23`	`# adjust "docker buildx build" lines to include appropriate "--build-context" flags (https://github.com/docker/buildx/pull/1886)`
`24`		`- \| .runs.build \|= gsub("docker buildx build "; "docker buildx build " + ($froms \| unique \| map(@sh "--build-context \(.)=docker-image://\("i386/" + .)") \| join(" ")) + " ")`
	`24`	`+ \| .runs.build \|= ( gsub("docker buildx build "; "docker buildx build " + ($froms \| unique \| map(@sh "--build-context \(.)=docker-image://\("i386/" + .)") \| join(" ")) + " ") \| gsub( "--platform[= ]linux/[^ ]+"; "--platform linux/386") )`
`25`	`25`	`]`
`26`	`26`	`' "$@"`