From 9859fed28215419837e7fe0c93fcd2c002ba68e5 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 20 Aug 2024 10:18:12 -0400 Subject: [PATCH 1/2] [Java] Pin Java JNI CI build to llvm 16 --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 14eeeeee6e5..00233d55499 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1204,6 +1204,7 @@ services: args: base: ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG} java: 11 + llvm: 16 context: . dockerfile: ci/docker/java-jni-manylinux-201x.dockerfile cache_from: From 0111ef84172ed9e27d6bd49e96d1debfdd640d14 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 20 Aug 2024 15:40:31 -0400 Subject: [PATCH 2/2] Add docker arg --- ci/docker/java-jni-manylinux-201x.dockerfile | 2 ++ docker-compose.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/ci/docker/java-jni-manylinux-201x.dockerfile b/ci/docker/java-jni-manylinux-201x.dockerfile index 479f4aa598b..d5adde07eb8 100644 --- a/ci/docker/java-jni-manylinux-201x.dockerfile +++ b/ci/docker/java-jni-manylinux-201x.dockerfile @@ -18,6 +18,8 @@ ARG base FROM ${base} +ARG llvm=16 + # Install the libraries required by the Gandiva to run # Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva RUN vcpkg install \ diff --git a/docker-compose.yml b/docker-compose.yml index 00233d55499..e896b91806a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1204,6 +1204,7 @@ services: args: base: ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG} java: 11 + # GH-XXX: Gandiva throws error with LLVM 17+ llvm: 16 context: . dockerfile: ci/docker/java-jni-manylinux-201x.dockerfile