Skip to content

Commit

Permalink
chore: switch to Noble (24.04) packages for apt.llvm.org (#460)
Browse files Browse the repository at this point in the history
* chore: switch to Noble (24.04) packages for apt.llvm.org

* chore: actually download llvm/clang from apt.llvm.org
  • Loading branch information
rjaegers authored Jun 21, 2024
1 parent 1cabb71 commit ced451d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
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 \
&& 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"
}

0 comments on commit ced451d

Please sign in to comment.