From 4c6b488344b701f0313be108a80a54b571d129e0 Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Wed, 14 Oct 2020 21:44:07 -0400 Subject: [PATCH 1/2] Fix inteminent sks keyserver failure --- .github/workflows/build-linux.yml | 5 +++-- .github/workflows/build-python.yml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index d90aad13c..d0b16d2ee 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -53,8 +53,9 @@ jobs: # pool.sks-keyservers.net is the SKS GPG global keyserver pool # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository # This key is not in the keystore by default for Ubuntu so we need to add it. - gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 - gpg -a --export 15CF4D18AF4F7421 | sudo apt-key add - + LLVM_KEY=15CF4D18AF4F7421 + gpg --keyserver ipv4.pool.sks-keyservers.net --recv-key $LLVM_KEY || gpg --keyserver ha.pool.sks-keyservers.net --recv-key $LLVM_KEY + gpg -a --export $LLVM_KEY | sudo apt-key add - sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" fi sudo apt-get -y update diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index 724f56dda..1c4953165 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -61,13 +61,13 @@ jobs: - name: Install (Linux) if: runner.os == 'Linux' run: | - # LLVM (clang) 9 is not in Bionic's repositories so we add the official LLVM repository. if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then # pool.sks-keyservers.net is the SKS GPG global keyserver pool # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository # This key is not in the keystore by default for Ubuntu so we need to add it. - gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 - gpg -a --export 15CF4D18AF4F7421 | sudo apt-key add - + LLVM_KEY=15CF4D18AF4F7421 + gpg --keyserver ipv4.pool.sks-keyservers.net --recv-key $LLVM_KEY || gpg --keyserver ha.pool.sks-keyservers.net --recv-key $LLVM_KEY + gpg -a --export $LLVM_KEY | sudo apt-key add - sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" fi sudo apt-get -y update From 91e0bb1170ed2f007345878233957f92212e82c6 Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Thu, 15 Oct 2020 21:14:48 -0400 Subject: [PATCH 2/2] Add notes --- .github/workflows/build-linux.yml | 3 ++- .github/workflows/build-python.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index d0b16d2ee..87a0430f8 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -50,7 +50,8 @@ jobs: run: | # LLVM (clang) 9 is not in Bionic's repositories so we add the official LLVM repository. if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then - # pool.sks-keyservers.net is the SKS GPG global keyserver pool + # (ipv4|ha).pool.sks-keyservers.net is the SKS GPG global keyserver pool + # ipv4 avoids potential timeouts because of crappy IPv6 infrastructure # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository # This key is not in the keystore by default for Ubuntu so we need to add it. LLVM_KEY=15CF4D18AF4F7421 diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index 1c4953165..fbec491f2 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -62,7 +62,8 @@ jobs: if: runner.os == 'Linux' run: | if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then - # pool.sks-keyservers.net is the SKS GPG global keyserver pool + # (ipv4|ha).pool.sks-keyservers.net is the SKS GPG global keyserver pool + # ipv4 avoids potential timeouts because of crappy IPv6 infrastructure # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository # This key is not in the keystore by default for Ubuntu so we need to add it. LLVM_KEY=15CF4D18AF4F7421