Skip to content

Commit 439fa38

Browse files
LuciferYangLuciferYang
authored
Merge branch 'apache:main' into fix-large-list-vector-precondition-logic
2 parents 1717f2e + 196b58a commit 439fa38

42 files changed

Lines changed: 924 additions & 212 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, upstream commit)

‎.github/workflows/comment_bot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
if: github.event.comment.body == 'take'
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/github-script@v8
33+
- uses: actions/github-script@v9
3434
with:
3535
github-token: ${{ secrets.GITHUB_TOKEN }}
3636
script: |-

‎.github/workflows/dev.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ name: Dev
1919

2020
on:
2121
pull_request: {}
22-
push: {}
22+
push:
23+
branches-ignore:
24+
- dependabot/**
2325

2426
concurrency:
2527
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
@@ -33,16 +35,16 @@ jobs:
3335
name: "pre-commit"
3436
runs-on: ubuntu-latest
3537
steps:
36-
- uses: actions/checkout@v6
38+
- uses: actions/checkout@v7
3739
with:
3840
fetch-depth: 0
3941
persist-credentials: false
4042

41-
- uses: actions/setup-python@v6
43+
- uses: actions/setup-python@v7
4244
with:
4345
python-version: '3.x'
4446
- name: pre-commit (cache)
45-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
47+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4648
with:
4749
path: ~/.cache/pre-commit
4850
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}

‎.github/workflows/dev_pr.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,35 @@ jobs:
4343
name: "Ensure PR format"
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@v6
46+
- uses: actions/checkout@v7
4747
with:
4848
fetch-depth: 0
4949
persist-credentials: false
5050

5151
- name: Ensure PR title format
5252
id: title-format
53-
uses: actions/github-script@v8
53+
uses: actions/github-script@v9
5454
with:
5555
script: |
5656
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
5757
return scripts.check_title_format({core, github, context});
5858
5959
- name: Label PR
60-
uses: actions/github-script@v8
60+
uses: actions/github-script@v9
6161
with:
6262
script: |
6363
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
6464
await scripts.apply_labels({core, github, context});
6565
6666
- name: Ensure PR is labeled
67-
uses: actions/github-script@v8
67+
uses: actions/github-script@v9
6868
with:
6969
script: |
7070
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
7171
await scripts.check_labels({core, github, context});
7272
7373
- name: Ensure PR is linked to an issue
74-
uses: actions/github-script@v8
74+
uses: actions/github-script@v9
7575
with:
7676
script: |
7777
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);

‎.github/workflows/integration.yml‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Integration
19+
20+
on:
21+
push:
22+
branches:
23+
- '**'
24+
- '!dependabot/**'
25+
tags:
26+
- '**'
27+
paths:
28+
- '.github/workflows/integration.yml'
29+
- '**/pom.xml'
30+
- 'c/**'
31+
- 'ci/scripts/**'
32+
- 'compose.yaml'
33+
- 'flight/**'
34+
- 'format/**'
35+
- 'testing/data/**'
36+
- 'vector/**'
37+
pull_request:
38+
paths:
39+
- '.github/workflows/integration.yml'
40+
- '**/pom.xml'
41+
- 'c/**'
42+
- 'ci/scripts/**'
43+
- 'compose.yaml'
44+
- 'flight/**'
45+
- 'format/**'
46+
- 'testing/data/**'
47+
- 'vector/**'
48+
49+
concurrency:
50+
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
51+
cancel-in-progress: true
52+
53+
permissions:
54+
contents: read
55+
56+
env:
57+
DOCKER_VOLUME_PREFIX: ".docker/"
58+
59+
jobs:
60+
integration:
61+
name: AMD64 integration
62+
runs-on: ubuntu-latest
63+
timeout-minutes: 60
64+
steps:
65+
- name: Checkout Arrow
66+
uses: actions/checkout@v7
67+
with:
68+
fetch-depth: 0
69+
repository: apache/arrow
70+
submodules: recursive
71+
- name: Checkout Arrow Rust
72+
uses: actions/checkout@v7
73+
with:
74+
repository: apache/arrow-rs
75+
path: rust
76+
- name: Checkout Arrow nanoarrow
77+
uses: actions/checkout@v7
78+
with:
79+
repository: apache/arrow-nanoarrow
80+
path: nanoarrow
81+
- name: Checkout Arrow .NET
82+
uses: actions/checkout@v7
83+
with:
84+
repository: apache/arrow-dotnet
85+
path: dotnet
86+
- name: Checkout Arrow Go
87+
uses: actions/checkout@v7
88+
with:
89+
repository: apache/arrow-go
90+
path: go
91+
- name: Checkout Arrow Java
92+
uses: actions/checkout@v7
93+
with:
94+
path: java
95+
- name: Checkout Arrow JavaScript
96+
uses: actions/checkout@v7
97+
with:
98+
repository: apache/arrow-js
99+
path: js
100+
- name: Free up disk space
101+
run: |
102+
ci/scripts/util_free_space.sh
103+
- name: Cache Docker Volumes
104+
uses: actions/cache@v6
105+
with:
106+
path: .docker
107+
key: integration-conda-${{ hashFiles('cpp/**') }}
108+
restore-keys: integration-conda-
109+
- name: Setup Python
110+
uses: actions/setup-python@v7
111+
with:
112+
python-version: 3.12
113+
- name: Setup Archery
114+
run: pip install -e dev/archery[docker]
115+
- name: Execute Docker Build
116+
run: |
117+
source ci/scripts/util_enable_core_dumps.sh
118+
archery docker run \
119+
-e ARCHERY_DEFAULT_BRANCH=main \
120+
-e ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS=java \
121+
-e ARCHERY_INTEGRATION_WITH_DOTNET=1 \
122+
-e ARCHERY_INTEGRATION_WITH_GO=1 \
123+
-e ARCHERY_INTEGRATION_WITH_JAVA=1 \
124+
-e ARCHERY_INTEGRATION_WITH_JS=1 \
125+
-e ARCHERY_INTEGRATION_WITH_NANOARROW=1 \
126+
-e ARCHERY_INTEGRATION_WITH_RUST=1 \
127+
conda-integration

0 commit comments

Comments
 (0)