Skip to content

Commit 56e5825

Browse files
committed
Update the resources to use for CI
1 parent 05ceb07 commit 56e5825

File tree

4 files changed

+5
-19
lines changed

4 files changed

+5
-19
lines changed

.env

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ARCH_SHORT=amd64
4040

4141
# Default repository to pull and push images from
4242
REPO=ghcr.io/apache/arrow-java-dev
43-
ARROW_REPO=apache/arrow-dev
43+
ARROW_REPO=ghcr.io/apache/arrow-dev
4444

4545
# The setup attempts to generate coredumps by default, in order to disable the
4646
# coredump generation set it to 0
@@ -53,5 +53,4 @@ 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.12
57-
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
56+
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release

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 dnf install -y java-$java-openjdk-devel && dnf clean all
3925

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

ci/scripts/jni_macos_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ github_actions_group_begin "Checking shared dependencies for libraries"
142142
pushd "${dist_dir}"
143143
archery linking check-dependencies \
144144
--allow CoreFoundation \
145+
--allow Network \
145146
--allow Security \
146147
--allow libSystem \
147148
--allow libarrow_cdata_jni \

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-${PYTHON}-${VCPKG}
101101
args:
102-
base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
102+
base: ${ARROW_REPO}:${ARCH}-cpp-jni-${VCPKG}
103103
volumes:
104104
- .:/arrow-java:delegated
105105
- ${ARROW_REPO_ROOT}:/arrow:delegated

0 commit comments

Comments
 (0)