You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/10/11 05:09:10 UTC
[arrow] branch master updated: ARROW-17977: [CI][C++] Don't use LLVM 14 or later on Debian i386 (#14368)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 9b1dddf779 ARROW-17977: [CI][C++] Don't use LLVM 14 or later on Debian i386 (#14368)
9b1dddf779 is described below
commit 9b1dddf7798e74783867350b26f6f2debd787369
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Tue Oct 11 14:09:02 2022 +0900
ARROW-17977: [CI][C++] Don't use LLVM 14 or later on Debian i386 (#14368)
Because LLVM 14 or later doesn't provide .deb for i386 at apt.llvm.org.
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
ci/docker/debian-10-cpp.dockerfile | 18 +++++++++++++++---
ci/docker/debian-11-cpp.dockerfile | 18 +++++++++++++++---
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/ci/docker/debian-10-cpp.dockerfile b/ci/docker/debian-10-cpp.dockerfile
index 57acc77a9e..411fd52d3c 100644
--- a/ci/docker/debian-10-cpp.dockerfile
+++ b/ci/docker/debian-10-cpp.dockerfile
@@ -25,20 +25,32 @@ RUN \
/etc/apt/sources.list.d/backports.list
ARG llvm
+# We can't use LLVM 14 or later from apt.llvm.org on i386 because LLVM
+# 14 or later dropped support for i386.
RUN apt-get update -y -q && \
+ apt-get install -y -q --no-install-recommends \
+ dpkg-dev && \
+ latest_available_llvm_i386=13 && \
+ if [ $(dpkg-architecture -qDEB_HOST_ARCH) = "i386" -a \
+ "${llvm}" -gt "${latest_available_llvm_i386}" ]; then \
+ available_llvm="${latest_available_llvm_i386}"; \
+ else \
+ available_llvm="${llvm}"; \
+ fi && \
+ apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
apt-transport-https \
ca-certificates \
gnupg \
wget && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
- echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-${llvm} main" > \
+ echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-${available_llvm} main" > \
/etc/apt/sources.list.d/llvm.list && \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
autoconf \
ccache \
- clang-${llvm} \
+ clang-${available_llvm} \
cmake \
curl \
g++ \
@@ -60,7 +72,7 @@ RUN apt-get update -y -q && \
libssl-dev \
libthrift-dev \
libutf8proc-dev \
- llvm-${llvm}-dev \
+ llvm-${available_llvm}-dev \
make \
ninja-build \
nlohmann-json3-dev \
diff --git a/ci/docker/debian-11-cpp.dockerfile b/ci/docker/debian-11-cpp.dockerfile
index b205f14f6d..5f9fbb2afb 100644
--- a/ci/docker/debian-11-cpp.dockerfile
+++ b/ci/docker/debian-11-cpp.dockerfile
@@ -22,20 +22,32 @@ ARG arch
ENV DEBIAN_FRONTEND noninteractive
ARG llvm
+# We can't use LLVM 14 or later from apt.llvm.org on i386 because LLVM
+# 14 or later dropped support for i386.
RUN apt-get update -y -q && \
+ apt-get install -y -q --no-install-recommends \
+ dpkg-dev && \
+ latest_available_llvm_i386=13 && \
+ if [ $(dpkg-architecture -qDEB_HOST_ARCH) = "i386" -a \
+ "${llvm}" -gt "${latest_available_llvm_i386}" ]; then \
+ available_llvm="${latest_available_llvm_i386}"; \
+ else \
+ available_llvm="${llvm}"; \
+ fi && \
+ apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
apt-transport-https \
ca-certificates \
gnupg \
wget && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
- echo "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${llvm} main" > \
+ echo "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${available_llvm} main" > \
/etc/apt/sources.list.d/llvm.list && \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
autoconf \
ccache \
- clang-${llvm} \
+ clang-${available_llvm} \
cmake \
curl \
g++ \
@@ -59,7 +71,7 @@ RUN apt-get update -y -q && \
libthrift-dev \
libutf8proc-dev \
libzstd-dev \
- llvm-${llvm}-dev \
+ llvm-${available_llvm}-dev \
make \
ninja-build \
nlohmann-json3-dev \