From a690dddbead0d9d956545c12ae8baec75c6e51a7 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 26 Aug 2021 16:06:30 -0700 Subject: [PATCH] Add BASHBREW_GENERATE_SKIP_PGP_PROXY variable to skip pgp-happy-eyeballs --- scripts/github-actions/generate.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/github-actions/generate.sh b/scripts/github-actions/generate.sh index 8e7ee0a..11ead65 100755 --- a/scripts/github-actions/generate.sh +++ b/scripts/github-actions/generate.sh @@ -158,22 +158,22 @@ strategy="$( "git clone --depth 1 https://github.com/docker-library/official-images.git -b master ~/oi", "# create a dummy empty image/layer so we can --filter since= later to get a meaningful image list", "{ echo FROM " + ( - if (.os | startswith("windows-")) then + if .os | startswith("windows-") then "mcr.microsoft.com/windows/servercore:ltsc" + (.os | ltrimstr("windows-")) else "busybox:latest" end ) + "; echo RUN :; } | docker build --no-cache --tag image-list-marker -", ( - if .os | startswith("windows-") | not then + if (env.BASHBREW_GENERATE_SKIP_PGP_PROXY) or (.os | startswith("windows-")) then + empty + else ( "# PGP Happy Eyeballs", "git clone --depth 1 https://github.com/tianon/pgp-happy-eyeballs.git ~/phe", "~/phe/hack-my-builds.sh", "rm -rf ~/phe" ) - else - empty end ) ] | join("\n")),