Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .devcontainer/cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ COPY .devcontainer/cpp/apt-requirements-clang.json /tmp/apt-requirements-clang.j
# hadolint ignore=SC1091
RUN wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-snapshot-keyring.gpg \
&& UBUNTU_CODENAME=$(. /etc/os-release; echo "${UBUNTU_CODENAME/*, /}") \
# && echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot-keyring.gpg] http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-${CLANG_VERSION} main" | tee /etc/apt/sources.list.d/llvm.list > /dev/null \
# Temporarily hardcode the Ubuntu version to 23.10 (mantic) as there is no support for 24.04 (noble) yet on apt.llvm.org
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot-keyring.gpg] http://apt.llvm.org/mantic/ llvm-toolchain-mantic-${CLANG_VERSION} main" | tee /etc/apt/sources.list.d/llvm.list > /dev/null \ && apt-get update \
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot-keyring.gpg] http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-${CLANG_VERSION} main" | tee /etc/apt/sources.list.d/llvm.list > /dev/null \
Comment thread
rjaegers marked this conversation as resolved.
&& echo -e 'Package: *\nPin: origin "apt.llvm.org"\nPin-Priority: 1000' > /etc/apt/preferences \
&& apt-get update \
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-clang.json | xargs apt-get install -y --no-install-recommends \
&& rm /tmp/apt-requirements* \
&& rm -rf /var/lib/apt/lists/*
Expand Down
16 changes: 8 additions & 8 deletions .devcontainer/cpp/apt-requirements-clang.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"clang-17": "1:17.0.6-9ubuntu1",
"clangd-17": "1:17.0.6-9ubuntu1",
"clang-format-17": "1:17.0.6-9ubuntu1",
"clang-tidy-17": "1:17.0.6-9ubuntu1",
"clang-tools-17": "1:17.0.6-9ubuntu1",
"libclang-rt-17-dev": "1:17.0.6-9ubuntu1",
"lld-17": "1:17.0.6-9ubuntu1",
"llvm-17": "1:17.0.6-9ubuntu1"
"clang-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
"clangd-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
"clang-format-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
"clang-tidy-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
"clang-tools-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
"libclang-rt-17-dev": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
"lld-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
"llvm-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8"
}