Skip to content

Commit

Permalink
_dl.sh: bump gpg import timeout for macOS CI host 2
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Aug 29, 2023
1 parent 27e6061 commit e4a3120
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions _dl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ my_curl() {

my_gpg() {
local opts
set -x
opts=()
if [ -z "${APPVEYOR_REPO_BRANCH:-}${CI_COMMIT_REF_NAME:-}${GITHUB_REF_NAME:-}" ]; then
# Do not populate user GPG configuration with build-related keys, unless
Expand All @@ -222,7 +223,7 @@ my_gpg() {
opts+=(--homedir "${gpgdir}")
fi
# Avoid an empty list to workaround bash 3 erroring "unbound variable"
opts+=(--batch --keyserver-options timeout=30 --keyid-format 0xlong)
opts+=(--batch --keyserver-options timeout=60 --keyid-format 0xlong)
gpg "${opts[@]}" "$@"
}

Expand Down Expand Up @@ -609,7 +610,7 @@ EOF
if printf '%s' "${key}" | grep -q -a '^https://'; then
# gnu-keyring.gpg can take a long time to import, so allow curl to
# run longer.
my_curl --max-time 60 "${key}" | my_gpg --quiet --import 2>/dev/null
my_curl --max-time 60 "${key}" | my_gpg --import
else
gpg_recv_key "${key}"
fi
Expand Down

0 comments on commit e4a3120

Please sign in to comment.