Skip to content

Commit 678e6e0

Browse files
committed
Circle CI: Use apt.llvm.org repo to install LLVM 14 on Ubuntu 20
The new min LLVM version isn't provided by Ubuntu 20 officially, so resort to the LLVM apt repo for now, as we are stuck with Ubuntu 20 due to the gdb regressions.
1 parent e7091dd commit 678e6e0

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

.circleci/config.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ commonSteps: &commonSteps
2020
apt-get -yq install \
2121
git-core $gcc_pkg \
2222
zlib1g-dev $libcurl_pkg curl gdb python3 python3-pip tzdata unzip zip \
23+
software-properties-common gnupg \
2324
$EXTRA_APT_PACKAGES
25+
# set up apt.llvm.org repo for being able to install more recent LLVM versions than provided by the distro
26+
curl -fsS https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
27+
add-apt-repository -y "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$LLVM_MAJOR main"
28+
apt-get -q update
29+
apt-get -yq install llvm-$LLVM_MAJOR-dev libclang-common-$LLVM_MAJOR-dev
2430
# Download & extract CMake
2531
curl -fL --retry 3 --max-time 300 -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz
2632
mkdir cmake
@@ -97,7 +103,7 @@ jobs:
97103
environment:
98104
- PARALLELISM: 4
99105
- CI_OS: linux
100-
- EXTRA_APT_PACKAGES: llvm-11-dev libclang-common-11-dev
106+
- LLVM_MAJOR: 14
101107
- HOST_LDC_VERSION: 1.24.0
102108
- EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DRT_SUPPORT_SANITIZERS=ON -DBUILD_LTO_LIBS=ON"
103109
Ubuntu-20.04-sharedLibsOnly-gdmd:
@@ -108,7 +114,8 @@ jobs:
108114
environment:
109115
- PARALLELISM: 4
110116
- CI_OS: linux
111-
- EXTRA_APT_PACKAGES: gdmd llvm-11-dev libclang-common-11-dev
117+
- LLVM_MAJOR: 14
118+
- EXTRA_APT_PACKAGES: gdmd
112119
- HOST_LDC_VERSION: 1.24.0
113120
- EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON -DD_COMPILER=gdmd -DLDC_LINK_MANUALLY=ON"
114121

0 commit comments

Comments
 (0)