Merge pull request #69 from HorizenOfficial/fixing_gpg_ci

fixing gpg verifying
HorizenOfficial · Nov 16, 2021 · 2af0dae · 2af0dae
2 parents debcfbc + 8784ec6
commit 2af0dae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -29,14 +29,13 @@ RUN set -eux && export GOSU_VERSION=1.12 && export DEBIAN_FRONTEND=noninteractiv
     \
 # verify the signature
     export GNUPGHOME="$(mktemp -d)"; \
-    gpg2 --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
-    gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
-    gpg2 --batch --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
-    gpg2 --batch --keyserver pgp.mit.edu --recv-key B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
-    gpg2 --batch --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
-    gpg2 --batch --keyserver pgp.key-server.io --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
-    gpg2 --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-    command -v gpgconf && gpgconf --kill all || :; \
+    ( gpg2 --batch --keyserver hkps://keys.openpgp.org --keyserver-options timeout=15 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
+      gpg2 --batch --keyserver keyserver.ubuntu.com --keyserver-options timeout=15 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
+      gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=15 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
+      gpg2 --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --keyserver-options timeout=15 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
+      gpg2 --batch --keyserver hkp://pgp.mit.edu:80 --keyserver-options timeout=15 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 ) \
+    && gpg2 --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
+    && command -v gpgconf && gpgconf --kill all || :; \
     rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
     \
 # clean up fetch dependencies

diff --git a/ci/setup_env.sh b/ci/setup_env.sh
@@ -14,13 +14,11 @@ touch "${HOME}/key.asc"
 if [ ! -z "${TRAVIS_TAG}" ]; then
   export GNUPGHOME="$(mktemp -d 2>/dev/null || mktemp -d -t 'GNUPGHOME')"
   echo "Tagged build, fetching maintainer keys."
-    gpg -v --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys $MAINTAINER_KEYS ||
-    gpg -v --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys $MAINTAINER_KEYS ||
-    gpg -v --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys $MAINTAINER_KEYS ||
-    gpg -v --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $MAINTAINER_KEYS || 
-    gpg -v --batch --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys $MAINTAINER_KEYS ||
-    gpg -v --batch --keyserver keyserver.pgp.com --recv-keys $MAINTAINER_KEYS ||
-    gpg -v --batch --keyserver pgp.key-server.io --recv-keys $MAINTAINER_KEYS
+  gpg -v --batch --keyserver hkps://keys.openpgp.org --recv-keys $MAINTAINER_KEYS ||
+  gpg -v --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys $MAINTAINER_KEYS ||
+  gpg -v --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys $MAINTAINER_KEYS ||
+  gpg -v --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys $MAINTAINER_KEYS ||
+  gpg -v --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys $MAINTAINER_KEYS
   if git verify-tag -v "${TRAVIS_TAG}"; then
     echo "Valid signed tag"
     if [[ "${CONTAINER_RUST_VER}" != *"nightly"* ]]; then