Skip to content

GH-1020: Update vcpkg revision #1023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kou wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −7
Draft

GH-1020: Update vcpkg revision #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ MAVEN=3.9.9
# Versions for various dependencies used to build artifacts
# Keep in sync with apache/arrow
ARROW_REPO_ROOT=./arrow
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
VCPKG="66c0373dc7fca549e5803087b9487edfe3aca0a1" # 2026.01.16 Release
9 changes: 6 additions & 3 deletions .github/workflows/rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
path: |
apache-arrow-java-*
jni-linux:
name: JNI ${{ matrix.platform.runs_on }} ${{ matrix.platform.arch }}
name: JNI ${{ matrix.platform.runs_on }} ${{ matrix.platform.arch }} (C++ ${{ matrix.apache-arrow-cpp }})
runs-on: ${{ matrix.platform.runs_on }}
timeout-minutes: 120
needs:
Expand All @@ -92,6 +92,9 @@ jobs:
- runs_on: ubuntu-24.04-arm
arch: "aarch_64"
archery_arch: "arm64v8"
apache-arrow-cpp:
- main
- released
env:
# architecture name used for archery build
ARCH: ${{ matrix.platform.archery_arch }}
Expand All @@ -108,11 +111,11 @@ jobs:
run: |
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
- name: Download the latest Apache Arrow C++
if: github.event_name != 'schedule'
if: matrix.apache-arrow-cpp == 'released'
run: |
ci/scripts/download_cpp.sh
- name: Checkout Apache Arrow C++
if: github.event_name == 'schedule'
if: matrix.apache-arrow-cpp == 'main'
uses: actions/checkout@v6
with:
repository: apache/arrow
Expand Down
7 changes: 4 additions & 3 deletions compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ services:
environment:
ARROW_JAVA_CDATA: "ON"
CCACHE_DIR: "/ccache"
command:
["git config --global --add safe.directory /arrow-java && \
/arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]
command: >-
/bin/bash -c "
git config --global --add safe.directory /arrow-java &&
/arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"
Loading