More CI hacking
parent
cf79e7dba0
commit
fdb910fc07
|
@ -55,8 +55,8 @@ jobs:
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: |
|
run: |
|
||||||
# LLVM (clang) 9 is not in Bionic's repositories so we add the official LLVM repository.
|
# LLVM (clang) 9/14 is not in Bionic's repositories so we add the official LLVM repository.
|
||||||
if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then
|
if [ "${{ matrix.compiler }}" = "clang" ]; then
|
||||||
# (ipv4|ha).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
|
# ipv4 avoids potential timeouts because of crappy IPv6 infrastructure
|
||||||
# 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository
|
# 15CF4D18AF4F7421 is the GPG key for the LLVM apt repository
|
||||||
|
|
|
@ -26,7 +26,7 @@ jobs:
|
||||||
macOS-11-xcode-13.4.1,
|
macOS-11-xcode-13.4.1,
|
||||||
]
|
]
|
||||||
|
|
||||||
build_type: [Debug]
|
build_type: [Release]
|
||||||
python_version: [3]
|
python_version: [3]
|
||||||
include:
|
include:
|
||||||
- name: ubuntu-20.04-gcc-9
|
- name: ubuntu-20.04-gcc-9
|
||||||
|
|
|
@ -69,6 +69,18 @@ jobs:
|
||||||
- name: Install (Linux)
|
- name: Install (Linux)
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux'
|
||||||
run: |
|
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 update
|
||||||
sudo apt-get -y install cmake build-essential pkg-config libpython3-dev python3-numpy libicu-dev
|
sudo apt-get -y install cmake build-essential pkg-config libpython3-dev python3-numpy libicu-dev
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue