From fdb910fc07ce8742980d1e3610aa027c3c515538 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sat, 4 Feb 2023 23:33:37 -0800 Subject: [PATCH] More CI hacking --- .github/workflows/build-linux.yml | 4 ++-- .github/workflows/build-python.yml | 2 +- .github/workflows/build-special.yml | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index c582bac44..2822059a8 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -55,8 +55,8 @@ jobs: - name: Install Dependencies 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 + # LLVM (clang) 9/14 is not in Bionic's repositories so we add the official LLVM repository. + if [ "${{ matrix.compiler }}" = "clang" ]; then # (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 diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index 615ec7a5a..f2fdc4d3b 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -26,7 +26,7 @@ jobs: macOS-11-xcode-13.4.1, ] - build_type: [Debug] + build_type: [Release] python_version: [3] include: - name: ubuntu-20.04-gcc-9 diff --git a/.github/workflows/build-special.yml b/.github/workflows/build-special.yml index 9a6752068..3ac081e70 100644 --- a/.github/workflows/build-special.yml +++ b/.github/workflows/build-special.yml @@ -69,6 +69,18 @@ jobs: - name: Install (Linux) if: runner.os == 'Linux' run: | + # LLVM (clang) 9/14 is not in Bionic's repositories so we add the official LLVM repository. + if [ "${{ matrix.compiler }}" = "clang" ]; then + # (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 + gpg --keyserver keyserver.ubuntu.com --recv-key $LLVM_KEY || gpg --keyserver hkp://keyserver.ubuntu.com:80 --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 sudo apt-get -y install cmake build-essential pkg-config libpython3-dev python3-numpy libicu-dev