Skip to content

Commit a690ddd

Browse files
committed
Add BASHBREW_GENERATE_SKIP_PGP_PROXY variable to skip pgp-happy-eyeballs
1 parent a4a65a7 commit a690ddd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/github-actions/generate.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,22 @@ strategy="$(
158158
"git clone --depth 1 https://github.com/docker-library/official-images.git -b master ~/oi",
159159
"# create a dummy empty image/layer so we can --filter since= later to get a meaningful image list",
160160
"{ echo FROM " + (
161-
if (.os | startswith("windows-")) then
161+
if .os | startswith("windows-") then
162162
"mcr.microsoft.com/windows/servercore:ltsc" + (.os | ltrimstr("windows-"))
163163
else
164164
"busybox:latest"
165165
end
166166
) + "; echo RUN :; } | docker build --no-cache --tag image-list-marker -",
167167
(
168-
if .os | startswith("windows-") | not then
168+
if (env.BASHBREW_GENERATE_SKIP_PGP_PROXY) or (.os | startswith("windows-")) then
169+
empty
170+
else
169171
(
170172
"# PGP Happy Eyeballs",
171173
"git clone --depth 1 https://github.com/tianon/pgp-happy-eyeballs.git ~/phe",
172174
"~/phe/hack-my-builds.sh",
173175
"rm -rf ~/phe"
174176
)
175-
else
176-
empty
177177
end
178178
)
179179
] | join("\n")),

0 commit comments

Comments
 (0)