Skip to content

Commit ee8e3ea

Browse files
committed
YYY
1 parent d31d9b0 commit ee8e3ea

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ MAVEN=3.9.9
5353
# Versions for various dependencies used to build artifacts
5454
# Keep in sync with apache/arrow
5555
ARROW_REPO_ROOT=./arrow
56-
PYTHON=3.9
57-
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
56+
PYTHON=3.10
57+
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release

.github/workflows/rc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ jobs:
121121
# if: github.event_name == 'schedule'
122122
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
123123
with:
124-
repository: apache/arrow
124+
repository: kou/arrow
125+
ref: ci-java-jni-linux
125126
path: arrow
126127
- name: Checkout apache/arrow-testing
127128
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

ci/docker/vcpkg-jni.dockerfile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,10 @@
1818
ARG base
1919
FROM ${base}
2020

21-
# Install the libraries required by Gandiva to run
22-
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
23-
RUN vcpkg install \
24-
--clean-after-build \
25-
--x-install-root=${VCPKG_ROOT}/installed \
26-
--x-manifest-root=/arrow/ci/vcpkg \
27-
--x-feature=dev \
28-
--x-feature=flight \
29-
--x-feature=gcs \
30-
--x-feature=json \
31-
--x-feature=parquet \
32-
--x-feature=gandiva \
33-
--x-feature=s3
34-
3521
# Install Java
3622
# We need Java for JNI headers, but we don't invoke Maven in this build.
3723
ARG java=11
38-
RUN yum install -y java-$java-openjdk-devel && yum clean all
24+
RUN dfn install -y java-$java-openjdk-devel && dfn clean all
3925

4026
# For ci/scripts/{cpp,java}_*.sh
4127
ENV ARROW_HOME=/tmp/local \

compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ services:
9999
cache_from:
100100
- ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
101101
args:
102-
base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
102+
base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
103103
volumes:
104104
- .:/arrow-java:delegated
105105
- ${ARROW_REPO_ROOT}:/arrow:delegated

0 commit comments

Comments
 (0)