From d4c801bb6bff04f924edccc847f97359b0906217 Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Sat, 10 Oct 2020 12:39:05 -0400 Subject: [PATCH 1/4] Fix LLVM repo keys --- .github/workflows/build-linux.yml | 2 ++ .github/workflows/build-python.yml | 2 ++ .github/workflows/build-special.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index afe328c3b6..7553675c8c 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -50,6 +50,8 @@ jobs: run: | # LLVM 9 is not in Bionic's repositories so we add the official LLVM repository. if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then + gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 + gpg -a --export 15CF4D18AF4F7421 | 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 b8d6bc3117..d4796e2bb1 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -63,6 +63,8 @@ jobs: run: | # LLVM 9 is not in Bionic's repositories so we add the official LLVM repository. if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then + gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 + gpg -a --export 15CF4D18AF4F7421 | 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-special.yml b/.github/workflows/build-special.yml index 648365f24d..c314acb162 100644 --- a/.github/workflows/build-special.yml +++ b/.github/workflows/build-special.yml @@ -56,6 +56,8 @@ jobs: run: | # LLVM 9 is not in Bionic's repositories so we add the official LLVM repository. if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then + gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 + gpg -a --export 15CF4D18AF4F7421 | 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 22e64ac82d6dee47ba3640b442d3e0c85d4997ee Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Mon, 12 Oct 2020 11:54:24 -0400 Subject: [PATCH 2/4] Add comments --- .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 7553675c8c..2195ad05c5 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -48,8 +48,9 @@ jobs: - name: Install (Linux) if: runner.os == 'Linux' run: | - # LLVM 9 is not in Bionic's repositories so we add the official LLVM repository. + # LLVM (clang) 9 is not in Bionic's repositories so we add the official LLVM repository. if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then + # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 gpg -a --export 15CF4D18AF4F7421 | sudo apt-key add - sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index d4796e2bb1..e348e31259 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -61,8 +61,9 @@ jobs: - name: Install (Linux) if: runner.os == 'Linux' run: | - # LLVM 9 is not in Bionic's repositories so we add the official LLVM repository. + # LLVM (clang) 9 is not in Bionic's repositories so we add the official LLVM repository. if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then + # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 gpg -a --export 15CF4D18AF4F7421 | sudo apt-key add - sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" From d4bdaf80800487e96c56f59d748833598f1cecff Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Wed, 14 Oct 2020 16:42:54 -0400 Subject: [PATCH 3/4] Add comments --- .github/workflows/build-linux.yml | 1 + .github/workflows/build-python.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 2195ad05c5..7aa818d049 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -50,6 +50,7 @@ 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 # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 gpg -a --export 15CF4D18AF4F7421 | sudo apt-key add - diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index e348e31259..5b9f7418bd 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -63,6 +63,7 @@ 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 # 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository gpg --keyserver pool.sks-keyservers.net --recv-key 15CF4D18AF4F7421 gpg -a --export 15CF4D18AF4F7421 | sudo apt-key add - From 2b8e9f44fada685d7b73fd47d84c15b35b449785 Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Wed, 14 Oct 2020 16:44:28 -0400 Subject: [PATCH 4/4] Add comments --- .github/workflows/build-linux.yml | 1 + .github/workflows/build-python.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 7aa818d049..d90aad13c8 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -52,6 +52,7 @@ jobs: 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 - sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index 5b9f7418bd..724f56dda8 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -65,6 +65,7 @@ jobs: 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 - sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main"