docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tianon Gravi 2024-10-07 15:23:52 -07:00
parent b0b055e5ca
commit d114db232b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/github-actions/generate.sh
View File

@ -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