Skip to content

Commit 638dbc4

Browse files
committed
GH-1020: Update vcpkg revision
1 parent bc7132b commit 638dbc4

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +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-
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
56+
VCPKG="66c0373dc7fca549e5803087b9487edfe3aca0a1" # 2026.01.16 Release

.github/workflows/rc.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
path: |
7878
apache-arrow-java-*
7979
jni-linux:
80-
name: JNI ${{ matrix.platform.runs_on }} ${{ matrix.platform.arch }}
80+
name: JNI ${{ matrix.platform.runs_on }} ${{ matrix.platform.arch }} (C++ ${{ matrix.apache-arrow-cpp }})
8181
runs-on: ${{ matrix.platform.runs_on }}
8282
timeout-minutes: 120
8383
needs:
@@ -92,6 +92,9 @@ jobs:
9292
- runs_on: ubuntu-24.04-arm
9393
arch: "aarch_64"
9494
archery_arch: "arm64v8"
95+
apache-arrow-cpp:
96+
- main
97+
- released
9598
env:
9699
# architecture name used for archery build
97100
ARCH: ${{ matrix.platform.archery_arch }}
@@ -108,11 +111,11 @@ jobs:
108111
run: |
109112
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
110113
- name: Download the latest Apache Arrow C++
111-
if: github.event_name != 'schedule'
114+
if: matrix.apache-arrow-cpp == 'released'
112115
run: |
113116
ci/scripts/download_cpp.sh
114117
- name: Checkout Apache Arrow C++
115-
if: github.event_name == 'schedule'
118+
if: matrix.apache-arrow-cpp == 'main'
116119
uses: actions/checkout@v6
117120
with:
118121
repository: apache/arrow

compose.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ services:
108108
environment:
109109
ARROW_JAVA_CDATA: "ON"
110110
CCACHE_DIR: "/ccache"
111-
command:
112-
["git config --global --add safe.directory /arrow-java && \
113-
/arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]
111+
command: >-
112+
/bin/bash -c "
113+
git config --global --add safe.directory /arrow-java &&
114+
/arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"

0 commit comments

Comments
 (0)