From 4be30e01750e9bfa3d34bb4cbc2afcaecb35174e Mon Sep 17 00:00:00 2001
From: Mara Robin B <mara@broda.me>
Date: Fri, 4 Mar 2022 09:40:56 +0100
Subject: [PATCH] ci: use sensible keyserver for gpg key retrieval (#1067)

---
 cumulus/.github/workflows/release-10_docker-manual.yml | 5 +++--
 cumulus/.github/workflows/release-10_docker.yml        | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cumulus/.github/workflows/release-10_docker-manual.yml b/cumulus/.github/workflows/release-10_docker-manual.yml
index da751646420..f6a7604ac8f 100644
--- a/cumulus/.github/workflows/release-10_docker-manual.yml
+++ b/cumulus/.github/workflows/release-10_docker-manual.yml
@@ -47,10 +47,11 @@ jobs:
 
           KEY_PARITY_SEC=9D4B2B6EB8F97156D19669A9FF0812D491B96798
           KEY_CHEVDOR=2835EAF92072BC01D188AF2C4A092B93E97CE1E2
+          KEYSERVER=keyserver.ubuntu.com
 
-          gpg --receive-keys $KEY_PARITY_SEC
+          gpg --keyserver $KEYSERVER --receive-keys $KEY_PARITY_SEC
           if [[ ${{ github.event.inputs.prerelease }} == "true" ]]; then
-              gpg --receive-keys $KEY_CHEVDOR
+              gpg --keyserver $KEYSERVER --receive-keys $KEY_CHEVDOR
           fi
 
           gpg --verify $BINARY.asc
diff --git a/cumulus/.github/workflows/release-10_docker.yml b/cumulus/.github/workflows/release-10_docker.yml
index c666147d9c3..361b36166b5 100644
--- a/cumulus/.github/workflows/release-10_docker.yml
+++ b/cumulus/.github/workflows/release-10_docker.yml
@@ -48,10 +48,11 @@ jobs:
 
           KEY_PARITY_SEC=9D4B2B6EB8F97156D19669A9FF0812D491B96798
           KEY_CHEVDOR=2835EAF92072BC01D188AF2C4A092B93E97CE1E2
+          KEYSERVER=keyserver.ubuntu.com
 
-          gpg --receive-keys $KEY_PARITY_SEC
+          gpg --keyserver $KEYSERVER --receive-keys $KEY_PARITY_SEC
           if [[ ${{ github.event.release.prerelease }} == "true" ]]; then
-              gpg --receive-keys $KEY_CHEVDOR
+              gpg --keyserver $KEYSERVER --receive-keys $KEY_CHEVDOR
           fi
 
           gpg --verify $BINARY.asc
-- 
GitLab