From d114db232be44bead087d8e74766761e089b124e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 7 Oct 2024 15:23:52 -0700 Subject: [PATCH] Remove `.bashbrew-buildkit-syntax` fallback in GHA This was left in intentionally as a backwards-compatibility shim during the transition to the script, but is no longer necessary. --- scripts/github-actions/generate.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/github-actions/generate.sh b/scripts/github-actions/generate.sh index b90ddb39..12aa9d68 100755 --- 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