Merge pull request #107 from infosiftr/bashbrew-buildkit-syntax

Remove `.bashbrew-buildkit-syntax` fallback in GHA
docker-library · Oct 14, 2024 · f71d6ef · f71d6ef
2 parents b0b055e + d114db2
commit f71d6ef
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/scripts/github-actions/generate.sh b/scripts/github-actions/generate.sh
@@ -199,14 +199,9 @@ strategy="$(
 						"# https://github.com/docker-library/bashbrew/pull/43",
 						if ([ .meta.entries[].builder ] | index("buildkit")) then
 							# https://github.com/docker-library/bashbrew/pull/70#issuecomment-1461033890 (we need to _not_ set BASHBREW_ARCH here)
-							"if [ -x ~/oi/.bin/bashbrew-buildkit-env-setup.sh ]; then",
-							"\t# https://github.com/docker-library/official-images/pull/14212",
-							"\tbuildkitEnvs=\"$(~/oi/.bin/bashbrew-buildkit-env-setup.sh)\"",
-							"\tjq <<<\"$buildkitEnvs\" -r \(env.envObjectToGitHubEnvFileJQ | @sh) | tee -a \"$GITHUB_ENV\"",
-							"else",
-							"\tBASHBREW_BUILDKIT_SYNTAX=\"$(< ~/oi/.bashbrew-buildkit-syntax)\"; export BASHBREW_BUILDKIT_SYNTAX",
-							"\tprintf \"BASHBREW_BUILDKIT_SYNTAX=%q\\n\" \"$BASHBREW_BUILDKIT_SYNTAX\" >> \"$GITHUB_ENV\"",
-							"fi",
+							# https://github.com/docker-library/official-images/pull/14212
+							"buildkitEnvs=\"$(~/oi/.bin/bashbrew-buildkit-env-setup.sh)\"",
+							"jq <<<\"$buildkitEnvs\" -r \(env.envObjectToGitHubEnvFileJQ | @sh) | tee -a \"$GITHUB_ENV\"",
 							empty
 						else
 							empty