Skip to content

Commit c2432af

Browse files
authored
GH-45510: [CI][C++] Fix LLVM APT repository preparation on Debian (#45511)
### Rationale for this change The existing LLVM APT repository preparation is broken. For example, it uses unavailable `${available_llvm}`. ### What changes are included in this PR? * Use `.asc` for armored key * Use deb822 format for APT source: https://manpages.debian.org/bookworm/dpkg-dev/deb822.5.en.html ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #45510 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Raúl Cumplido <[email protected]>
1 parent 18e8f50 commit c2432af

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

‎ci/docker/debian-12-cpp.dockerfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ RUN apt-get update -y -q && \
3030
lsb-release \
3131
wget && \
3232
if [ ${llvm} -ge 17 ]; then \
33-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | \
34-
gpg \
35-
--import - \
36-
--keyring /usr/share/keyrings/llvm-snapshot.gpg \
37-
--no-default-keyring && \
38-
echo "deb[keyring=/usr/share/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/$(lsb_release --codename --short)/ llvm-toolchain-$(lsb_release --codename --short)-${available_llvm} main" > \
39-
/etc/apt/sources.list.d/llvm.list; \
33+
wget -O /usr/share/keyrings/llvm-snapshot.asc \
34+
https://apt.llvm.org/llvm-snapshot.gpg.key && \
35+
(echo "Types: deb"; \
36+
echo "URIs: https://apt.llvm.org/$(lsb_release --codename --short)/"; \
37+
echo "Suites: llvm-toolchain-$(lsb_release --codename --short)-${llvm}"; \
38+
echo "Components: main"; \
39+
echo "Signed-By: /usr/share/keyrings/llvm-snapshot.asc") | \
40+
tee /etc/apt/sources.list.d/llvm.sources; \
4041
fi && \
4142
apt-get update -y -q && \
4243
apt-get install -y -q --no-install-recommends \

0 commit comments

Comments
 (0)