Skip to content

Commit 4bcd093

Browse files
committed
ci: stop using LLVM setup script to setup repo
The upcoming slim container will be installing fewer packages than default to allow for TSan to work. Also lets us drop a few packages.
1 parent a4ce15b commit 4bcd093

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

contrib/containers/ci/ci.Dockerfile

+7-9
Original file line numberDiff line numberDiff line change
@@ -49,33 +49,31 @@ RUN set -ex; \
4949
g++ \
5050
gettext \
5151
git \
52-
gnupg \
5352
libtool \
54-
lsb-release \
55-
software-properties-common \
5653
unzip \
57-
wget \
5854
m4 \
5955
pkg-config \
6056
zlib1g-dev \
6157
&& rm -rf /var/lib/apt/lists/*
6258

6359
# Install Clang+LLVM and set it as default
64-
# We don't need all packages but the default set doesn't include some
65-
# packages we want so we will need to install some of them manually.
6660
ARG LLVM_VERSION=18
6761
RUN set -ex; \
6862
echo "Installing LLVM and Clang ${LLVM_VERSION}..."; \
69-
curl -sL https://apt.llvm.org/llvm.sh | bash -s -- "${LLVM_VERSION}"; \
70-
echo "Installing additional packages..."; \
71-
apt-get update && apt-get install $APT_ARGS \
63+
. /etc/os-release; \
64+
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key > /etc/apt/trusted.gpg.d/apt.llvm.org.asc; \
65+
echo "deb [signed-by=/etc/apt/trusted.gpg.d/apt.llvm.org.asc] http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-${LLVM_VERSION} main" > /etc/apt/sources.list.d/llvm.list; \
66+
apt-get update && apt-get install ${APT_ARGS} \
67+
"clang-${LLVM_VERSION}" \
68+
"clangd-${LLVM_VERSION}" \
7269
"clang-format-${LLVM_VERSION}" \
7370
"clang-tidy-${LLVM_VERSION}" \
7471
"libc++-${LLVM_VERSION}-dev" \
7572
"libc++abi-${LLVM_VERSION}-dev" \
7673
"libclang-${LLVM_VERSION}-dev" \
7774
"libclang-rt-${LLVM_VERSION}-dev" \
7875
"lld-${LLVM_VERSION}" \
76+
"lldb-${LLVM_VERSION}" \
7977
"llvm-${LLVM_VERSION}-dev"; \
8078
rm -rf /var/lib/apt/lists/*; \
8179
echo "Setting defaults..."; \

0 commit comments

Comments
 (0)