Skip to content

Commit 1d41a3d

Browse files
jbonofrejbonofre
authored
Merge branch 'main' into dependabot/maven/checker.framework.version-3.49.5
2 parents 59dea70 + edc6cf3 commit 1d41a3d

File tree

73 files changed

+1527
-302
lines changed

Some content is hidden

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

73 files changed

+1527
-302
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.9
57-
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
56+
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release

‎.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@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
33+
- uses: actions/github-script@v8
3434
with:
3535
github-token: ${{ secrets.GITHUB_TOKEN }}
3636
script: |-

‎.github/workflows/dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
fetch-depth: 0
3939
persist-credentials: false
4040

41-
- uses: actions/setup-python@v5
41+
- uses: actions/setup-python@v6
4242
with:
4343
python-version: '3.x'
4444
- name: pre-commit (cache)
45-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
45+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
4646
with:
4747
path: ~/.cache/pre-commit
4848
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}

‎.github/workflows/dev_pr.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ concurrency:
3535

3636
permissions:
3737
contents: read
38+
issues: write
3839
pull-requests: write
3940

4041
jobs:
@@ -49,28 +50,28 @@ jobs:
4950

5051
- name: Ensure PR title format
5152
id: title-format
52-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
53+
uses: actions/github-script@v8
5354
with:
5455
script: |
5556
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
5657
return scripts.check_title_format({core, github, context});
5758
5859
- name: Label PR
59-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
60+
uses: actions/github-script@v8
6061
with:
6162
script: |
6263
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
6364
await scripts.apply_labels({core, github, context});
6465
6566
- name: Ensure PR is labeled
66-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
67+
uses: actions/github-script@v8
6768
with:
6869
script: |
6970
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
7071
await scripts.check_labels({core, github, context});
7172
7273
- name: Ensure PR is linked to an issue
73-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
74+
uses: actions/github-script@v8
7475
with:
7576
script: |
7677
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
@@ -80,9 +81,5 @@ jobs:
8081
if: '! github.event.pull_request.draft'
8182
env:
8283
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83-
permissions:
84-
contents: read
85-
issues: write
86-
pull-requests: write
8784
run: |
8885
./.github/workflows/dev_pr_milestone.sh "${GITHUB_REPOSITORY}" ${{ github.event.number }}

‎.github/workflows/rc.yml‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
packages: write
102102
steps:
103103
- name: Download source archive
104-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
104+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
105105
with:
106106
name: release-source
107107
- name: Extract source archive
@@ -133,13 +133,13 @@ jobs:
133133
with:
134134
repository: apache/parquet-testing
135135
path: arrow/cpp/submodules/parquet-testing
136-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
136+
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
137137
with:
138138
registry: ghcr.io
139139
username: ${{ github.actor }}
140140
password: ${{ secrets.GITHUB_TOKEN }}
141141
- name: Cache
142-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
142+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
143143
with:
144144
path: .docker
145145
key: jni-linux-${{ matrix.platform.arch }}-${{ hashFiles('arrow/cpp/**') }}
@@ -168,13 +168,13 @@ jobs:
168168
fail-fast: false
169169
matrix:
170170
platform:
171-
- { runs_on: macos-13, arch: "x86_64"}
171+
- { runs_on: macos-15-intel, arch: "x86_64"}
172172
- { runs_on: macos-14, arch: "aarch_64" }
173173
env:
174174
MACOSX_DEPLOYMENT_TARGET: "14.0"
175175
steps:
176176
- name: Download source archive
177-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
177+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
178178
with:
179179
name: release-source
180180
- name: Extract source archive
@@ -201,7 +201,7 @@ jobs:
201201
repository: apache/parquet-testing
202202
path: arrow/cpp/submodules/parquet-testing
203203
- name: Set up Python
204-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
204+
uses: actions/setup-python@v6
205205
with:
206206
cache: 'pip'
207207
python-version: 3.12
@@ -222,7 +222,7 @@ jobs:
222222
brew uninstall llvm || :
223223
224224
# We can remove this when we drop support for
225-
# macos-13. because macos-14 or later uses /opt/homebrew/
225+
# macos-15-intel. because macos-14 or later with arm64 uses /opt/homebrew/
226226
# not /usr/local/.
227227
#
228228
# Ensure updating python@XXX with the "--overwrite" option.
@@ -270,7 +270,7 @@ jobs:
270270
run: |
271271
echo "CCACHE_DIR=${PWD}/ccache" >> ${GITHUB_ENV}
272272
- name: Cache ccache
273-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
273+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
274274
with:
275275
path: ccache
276276
key: jni-macos-${{ matrix.platform.arch }}-${{ hashFiles('arrow/cpp/**') }}
@@ -298,30 +298,36 @@ jobs:
298298
fail-fast: false
299299
matrix:
300300
platform:
301-
- runs_on: windows-2019
301+
- runs_on: windows-2022
302302
arch: "x86_64"
303303
steps:
304304
- name: Download source archive
305-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
305+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
306306
with:
307307
name: release-source
308308
- name: Extract source archive
309309
shell: bash
310310
run: |
311311
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
312-
- name: Download the latest Apache Arrow C++
313-
if: github.event_name != 'schedule'
314-
shell: bash
315-
run: |
316-
ci/scripts/download_cpp.sh
312+
# We always use the main branch for apache/arrow for now.
313+
# Because we want to use
314+
# https://github.com/apache/arrow/pull/47749 in
315+
# apache/arrow-java. We can revert this workaround once Apache
316+
# Arrow 22.0.0 that includes the change released.
317+
#
318+
# - name: Download the latest Apache Arrow C++
319+
# if: github.event_name != 'schedule'
320+
# shell: bash
321+
# run: |
322+
# ci/scripts/download_cpp.sh
317323
- name: Checkout Apache Arrow C++
318-
if: github.event_name == 'schedule'
324+
# if: github.event_name == 'schedule'
319325
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
320326
with:
321327
repository: apache/arrow
322328
path: arrow
323329
- name: Set up Java
324-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
330+
uses: actions/setup-java@v5
325331
with:
326332
java-version: '11'
327333
distribution: 'temurin'
@@ -346,15 +352,15 @@ jobs:
346352
run: |
347353
echo "CCACHE_DIR=${PWD}/ccache" >> ${GITHUB_ENV}
348354
- name: Cache ccache
349-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
355+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
350356
with:
351357
path: ccache
352358
key: jni-windows-${{ matrix.platform.arch }}-${{ hashFiles('arrow/cpp/**') }}
353359
restore-keys: jni-windows-${{ matrix.platform.arch }}-
354360
- name: Build
355361
shell: cmd
356362
run: |
357-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
363+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
358364
REM For ORC
359365
set TZDIR=/c/msys64/usr/share/zoneinfo
360366
bash -c "ci/scripts/jni_windows_build.sh . arrow build jni"
@@ -375,7 +381,7 @@ jobs:
375381
- jni-windows
376382
steps:
377383
- name: Download artifacts
378-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
384+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
379385
with:
380386
path: artifacts
381387
- name: Decompress artifacts
@@ -420,7 +426,7 @@ jobs:
420426
repository: apache/arrow-testing
421427
path: testing
422428
- name: Cache ~/.m2
423-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
429+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
424430
with:
425431
path: ~/.m2
426432
key: binaries-build-${{ hashFiles('**/*.java', '**/pom.xml') }}
@@ -452,15 +458,15 @@ jobs:
452458
contents: read
453459
packages: write
454460
steps:
455-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
461+
- uses: actions/setup-python@v6
456462
with:
457463
cache: 'pip'
458464
- name: Download source archive
459-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
465+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
460466
with:
461467
name: release-source
462468
- name: Download Javadocs
463-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
469+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
464470
with:
465471
name: reference
466472
- name: Extract source archive
@@ -525,7 +531,7 @@ jobs:
525531
cp ../.asf.yaml ./
526532
git add .nojekyll .asf.yaml
527533
- name: Download
528-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
534+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
529535
with:
530536
name: release-html
531537
- name: Extract
@@ -561,7 +567,7 @@ jobs:
561567
- ubuntu-latest
562568
steps:
563569
- name: Download release artifacts
564-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
570+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
565571
with:
566572
pattern: release-*
567573
- name: Verify
@@ -595,7 +601,7 @@ jobs:
595601
contents: write
596602
steps:
597603
- name: Download release artifacts
598-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
604+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
599605
with:
600606
pattern: release-*
601607
path: artifacts

‎.github/workflows/test.yml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ jobs:
5858
MAVEN: ${{ matrix.maven }}
5959
steps:
6060
- name: Checkout Arrow
61-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
61+
uses: actions/checkout@v5
6262
with:
6363
fetch-depth: 0
6464
submodules: recursive
6565
- name: Cache Docker Volumes
66-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
66+
uses: actions/cache@v4
6767
with:
6868
path: .docker
6969
key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('compose.yaml', '**/pom.xml', '**/*.java') }}
@@ -95,12 +95,12 @@ jobs:
9595
macos: latest
9696
steps:
9797
- name: Set up Java
98-
uses: actions/setup-java@v4
98+
uses: actions/setup-java@v5
9999
with:
100100
distribution: 'temurin'
101101
java-version: ${{ matrix.jdk }}
102102
- name: Checkout Arrow
103-
uses: actions/checkout@v4
103+
uses: actions/checkout@v5
104104
with:
105105
fetch-depth: 0
106106
submodules: recursive
@@ -126,12 +126,12 @@ jobs:
126126
jdk: [11]
127127
steps:
128128
- name: Set up Java
129-
uses: actions/setup-java@v4
129+
uses: actions/setup-java@v5
130130
with:
131131
java-version: ${{ matrix.jdk }}
132132
distribution: 'temurin'
133133
- name: Checkout Arrow
134-
uses: actions/checkout@v4
134+
uses: actions/checkout@v5
135135
with:
136136
fetch-depth: 0
137137
submodules: recursive
@@ -152,46 +152,51 @@ jobs:
152152
timeout-minutes: 60
153153
steps:
154154
- name: Checkout Arrow
155-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
155+
uses: actions/checkout@v5
156156
with:
157157
fetch-depth: 0
158158
repository: apache/arrow
159159
submodules: recursive
160160
- name: Checkout Arrow Rust
161-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
161+
uses: actions/checkout@v5
162162
with:
163163
repository: apache/arrow-rs
164164
path: rust
165165
- name: Checkout Arrow nanoarrow
166-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
166+
uses: actions/checkout@v5
167167
with:
168168
repository: apache/arrow-nanoarrow
169169
path: nanoarrow
170+
- name: Checkout Arrow .NET
171+
uses: actions/checkout@v5
172+
with:
173+
repository: apache/arrow-dotnet
174+
path: dotnet
170175
- name: Checkout Arrow Go
171-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
176+
uses: actions/checkout@v5
172177
with:
173178
repository: apache/arrow-go
174179
path: go
175180
- name: Checkout Arrow Java
176-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
181+
uses: actions/checkout@v5
177182
with:
178183
path: java
179184
- name: Checkout Arrow JavaScript
180-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
185+
uses: actions/checkout@v5
181186
with:
182187
repository: apache/arrow-js
183188
path: js
184189
- name: Free up disk space
185190
run: |
186191
ci/scripts/util_free_space.sh
187192
- name: Cache Docker Volumes
188-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
193+
uses: actions/cache@v4
189194
with:
190195
path: .docker
191196
key: integration-conda-${{ hashFiles('cpp/**') }}
192197
restore-keys: integration-conda-
193198
- name: Setup Python
194-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
199+
uses: actions/setup-python@v6
195200
with:
196201
python-version: 3.12
197202
- name: Setup Archery
@@ -202,6 +207,7 @@ jobs:
202207
archery docker run \
203208
-e ARCHERY_DEFAULT_BRANCH=main \
204209
-e ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS=java \
210+
-e ARCHERY_INTEGRATION_WITH_DOTNET=1 \
205211
-e ARCHERY_INTEGRATION_WITH_GO=1 \
206212
-e ARCHERY_INTEGRATION_WITH_JAVA=1 \
207213
-e ARCHERY_INTEGRATION_WITH_JS=1 \

0 commit comments

Comments
 (0)