This is an automated email from the ASF dual-hosted git repository.
raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new c2432af546 GH-45510: [CI][C++] Fix LLVM APT repository preparation on
Debian (#45511)
c2432af546 is described below
commit c2432af546f39344fd9425e718dc29313d278d1b
Author: Sutou Kouhei <[email protected]>
AuthorDate: Wed Feb 12 21:21:43 2025 +0900
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]>
---
ci/docker/debian-12-cpp.dockerfile | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/ci/docker/debian-12-cpp.dockerfile
b/ci/docker/debian-12-cpp.dockerfile
index fe3976248c..44c845bb17 100644
--- a/ci/docker/debian-12-cpp.dockerfile
+++ b/ci/docker/debian-12-cpp.dockerfile
@@ -30,13 +30,14 @@ RUN apt-get update -y -q && \
lsb-release \
wget && \
if [ ${llvm} -ge 17 ]; then \
- wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | \
- gpg \
- --import - \
- --keyring /usr/share/keyrings/llvm-snapshot.gpg \
- --no-default-keyring && \
- 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" > \
- /etc/apt/sources.list.d/llvm.list; \
+ wget -O /usr/share/keyrings/llvm-snapshot.asc \
+ https://apt.llvm.org/llvm-snapshot.gpg.key && \
+ (echo "Types: deb"; \
+ echo "URIs: https://apt.llvm.org/$(lsb_release --codename --short)/"; \
+ echo "Suites: llvm-toolchain-$(lsb_release --codename
--short)-${llvm}"; \
+ echo "Components: main"; \
+ echo "Signed-By: /usr/share/keyrings/llvm-snapshot.asc") | \
+ tee /etc/apt/sources.list.d/llvm.sources; \
fi && \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
