Skip to content

Commit

Permalink
Remove .bashbrew-buildkit-syntax fallback in GHA
Browse files Browse the repository at this point in the history
This was left in intentionally as a backwards-compatibility shim during the transition to the script, but is no longer necessary.
  • Loading branch information
tianon committed Oct 7, 2024
1 parent b0b055e commit d114db2
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions scripts/github-actions/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d114db2

Please sign in to comment.