Skip to content

Commit d55677c

Browse files
author
Rafał Hibner
committed
Merge branch 'main' into combined2
2 parents 1c996a9 + 3ebe7ee commit d55677c

940 files changed

Lines changed: 10473 additions & 83001 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.

.editorconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ indent_style = space
5050
indent_size = 2
5151
indent_style = space
5252

53-
[*.go]
54-
indent_size = 8
55-
indent_style = tab
56-
tab_width = 8
57-
58-
[*.{js,ts}]
59-
indent_size = 4
60-
indent_style = space
61-
6253
[*.{py,pyx,pxd,pxi}]
6354
indent_size = 4
6455
indent_style = space

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ KARTOTHEK=latest
6565
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
6666
LLVM=18
6767
MAVEN=3.8.7
68-
NODE=18
68+
NODE=20
6969
NUMBA=latest
7070
NUMPY=latest
7171
PANDAS=latest

.github/CODEOWNERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,12 @@
3434
/cpp/src/arrow/flight/ @lidavidm
3535
/cpp/src/parquet @wgtmac
3636
/csharp/ @curthagenlocher
37-
/go/ @zeroshade
38-
/java/ @lidavidm
39-
/js/ @domoritz @trxcllnt
4037
/matlab/ @kevingurney @kou @sgilmore10
4138
/python/ @AlenkaF @raulcd @rok
4239
/python/pyarrow/_flight.pyx @lidavidm
4340
/python/pyarrow/**/*gandiva* @wjones127
4441
/r/ @jonkeane @thisisnic
4542
/ruby/ @kou
46-
/swift/ @kou
4743

4844
# Docs
4945
# /docs/

.github/workflows/cpp.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ on:
2929
- '.github/workflows/cpp.yml'
3030
- 'ci/conda_env_*'
3131
- 'ci/docker/**'
32+
- 'ci/scripts/ccache_setup.sh'
3233
- 'ci/scripts/cpp_*'
3334
- 'ci/scripts/install_azurite.sh'
3435
- 'ci/scripts/install_gcs_testbench.sh'
@@ -45,6 +46,7 @@ on:
4546
- '.github/workflows/cpp.yml'
4647
- 'ci/conda_env_*'
4748
- 'ci/docker/**'
49+
- 'ci/scripts/ccache_setup.sh'
4850
- 'ci/scripts/cpp_*'
4951
- 'ci/scripts/install_azurite.sh'
5052
- 'ci/scripts/install_gcs_testbench.sh'
@@ -375,7 +377,7 @@ jobs:
375377
376378
windows-mingw:
377379
name: AMD64 Windows MinGW ${{ matrix.msystem_upper }} C++
378-
runs-on: windows-2019
380+
runs-on: windows-2022
379381
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
380382
# Build may take 1h+ without cache.
381383
timeout-minutes: 120

.github/workflows/cpp_extra.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ on:
2727
- '.github/workflows/cpp_extra.yml'
2828
- 'ci/conda_env_*'
2929
- 'ci/docker/**'
30+
- 'ci/scripts/ccache_setup.sh'
3031
- 'ci/scripts/cpp_*'
3132
- 'ci/scripts/install_azurite.sh'
3233
- 'ci/scripts/install_gcs_testbench.sh'
@@ -45,6 +46,7 @@ on:
4546
- '.github/workflows/cpp_extra.yml'
4647
- 'ci/conda_env_*'
4748
- 'ci/docker/**'
49+
- 'ci/scripts/ccache_setup.sh'
4850
- 'ci/scripts/cpp_*'
4951
- 'ci/scripts/install_azurite.sh'
5052
- 'ci/scripts/install_gcs_testbench.sh'
@@ -85,7 +87,7 @@ jobs:
8587
GH_TOKEN: ${{ github.token }}
8688
run: |
8789
case "${GITHUB_EVENT_NAME}" in
88-
push|workflow_dispatch)
90+
push|schedule)
8991
ci_extra=true
9092
;;
9193
pull_request)
@@ -114,6 +116,9 @@ jobs:
114116
fail-fast: false
115117
matrix:
116118
include:
119+
- image: alpine-linux-cpp
120+
runs-on: ubuntu-latest
121+
title: AMD64 Alpine Linux
117122
- image: conda-cpp
118123
run-options: >-
119124
-e ARROW_USE_MESON=ON
@@ -122,7 +127,7 @@ jobs:
122127
env:
123128
ARCHERY_DEBUG: 1
124129
ARROW_ENABLE_TIMING_TESTS: OFF
125-
# DOCKER_VOLUME_PREFIX: ".docker/"
130+
DOCKER_VOLUME_PREFIX: ".docker/"
126131
steps:
127132
- name: Checkout Arrow
128133
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/csharp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ jobs:
7373
run: ci/scripts/csharp_test.sh $(pwd)
7474

7575
windows:
76-
name: AMD64 Windows 2019 18.04 C# ${{ matrix.dotnet }}
77-
runs-on: windows-2019
76+
name: AMD64 Windows C# ${{ matrix.dotnet }}
77+
runs-on: windows-2022
7878
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
7979
timeout-minutes: 15
8080
strategy:

.github/workflows/dev.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,52 +41,32 @@ jobs:
4141

4242
lint:
4343
name: Lint C++, Python, R, Docker, RAT
44-
runs-on: ubuntu-24.04
44+
# Use Ubuntu 22.04 to ensure working pre-commit on Ubuntu 22.04.
45+
runs-on: ubuntu-22.04
4546
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
4647
timeout-minutes: 15
4748
steps:
4849
- name: Checkout Arrow
4950
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
5051
with:
5152
fetch-depth: 0
52-
- name: Setup Python
53-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
54-
with:
55-
python-version: 3.12
56-
- uses: r-lib/actions/setup-r@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 # v2.11.3
5753
- name: Install pre-commit
5854
run: |
59-
python -m pip install pre-commit
60-
pre-commit run --show-diff-on-failure --color=always
55+
sudo apt update
56+
sudo apt install -y -V \
57+
pre-commit \
58+
r-base \
59+
ruby-dev
6160
- name: Cache pre-commit
6261
uses: actions/cache@v4
6362
with:
64-
path: ~/.cache/pre-commit
63+
path: |
64+
~/.cache/pre-commit
65+
~/.local/share/renv/cache
6566
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
6667
- name: Run pre-commit
6768
run: |
6869
pre-commit run --all-files --color=always --show-diff-on-failure
69-
- name: Setup Archery
70-
run: pip install -e dev/archery[docker]
71-
- name: Execute Docker Build
72-
env:
73-
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
74-
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
75-
UBUNTU: 22.04
76-
run: |
77-
source ci/scripts/util_enable_core_dumps.sh
78-
archery docker run -e GITHUB_ACTIONS=true ubuntu-lint
79-
- name: Docker Push
80-
if: >-
81-
success() &&
82-
github.event_name == 'push' &&
83-
github.repository == 'apache/arrow' &&
84-
github.ref_name == 'main'
85-
env:
86-
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
87-
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
88-
continue-on-error: true
89-
run: archery docker push ubuntu-lint
9070
9171
release:
9272
name: Source Release and Merge Script on ${{ matrix.runs-on }}

.github/workflows/dev_pr/labeler.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@
3030
- any-glob-to-any-file:
3131
- csharp/**/*
3232

33-
"Component: Go":
34-
- changed-files:
35-
- any-glob-to-any-file:
36-
- go/**/*
37-
38-
"Component: JavaScript":
39-
- changed-files:
40-
- any-glob-to-any-file:
41-
- js/**/*
42-
4333
"Component: MATLAB":
4434
- changed-files:
4535
- any-glob-to-any-file:
@@ -60,11 +50,6 @@
6050
- any-glob-to-any-file:
6151
- ruby/**/*
6252

63-
"Component: Swift":
64-
- changed-files:
65-
- any-glob-to-any-file:
66-
- swift/**/*
67-
6853
"Component: FlightRPC":
6954
- changed-files:
7055
- any-glob-to-any-file:

.github/workflows/matlab.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Install MATLAB
6060
uses: matlab-actions/setup-matlab@v2
6161
with:
62-
release: R2024b
62+
release: R2025a
6363
- name: Install ccache
6464
run: sudo apt-get install ccache
6565
- name: Setup ccache
@@ -107,7 +107,7 @@ jobs:
107107
- name: Install MATLAB
108108
uses: matlab-actions/setup-matlab@v2
109109
with:
110-
release: R2024b
110+
release: R2025a
111111
- name: Install ccache
112112
run: brew install ccache
113113
- name: Setup ccache
@@ -146,7 +146,7 @@ jobs:
146146
- name: Install MATLAB
147147
uses: matlab-actions/setup-matlab@v2
148148
with:
149-
release: R2024b
149+
release: R2025a
150150
- name: Download Timezone Database
151151
shell: bash
152152
run: ci/scripts/download_tz_database.sh

.github/workflows/r.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196

197197
windows-cpp:
198198
name: AMD64 Windows C++ RTools ${{ matrix.config.rtools }} ${{ matrix.config.arch }}
199-
runs-on: windows-2019
199+
runs-on: windows-2022
200200
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
201201
timeout-minutes: 90
202202
strategy:
@@ -248,7 +248,7 @@ jobs:
248248
windows-r:
249249
needs: [windows-cpp]
250250
name: AMD64 Windows R ${{ matrix.config.rversion }}
251-
runs-on: windows-2019
251+
runs-on: windows-2022
252252
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
253253
timeout-minutes: 75
254254
strategy:
@@ -331,24 +331,6 @@ jobs:
331331
check_dir = 'check',
332332
timeout = 3600
333333
)
334-
- name: Run lintr
335-
if: ${{ matrix.config.rversion == 'release' }}
336-
env:
337-
NOT_CRAN: "true"
338-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
339-
shell: Rscript {0}
340-
working-directory: r
341-
run: |
342-
Sys.setenv(
343-
RWINLIB_LOCAL = file.path(Sys.getenv("GITHUB_WORKSPACE"), "r", "windows", "libarrow.zip"),
344-
MAKEFLAGS = paste0("-j", parallel::detectCores()),
345-
ARROW_R_DEV = TRUE,
346-
"_R_CHECK_FORCE_SUGGESTS_" = FALSE
347-
)
348-
# we use pak for package installation since it is faster, safer and more convenient
349-
pak::local_install()
350-
pak::pak("lintr")
351-
lintr::expect_lint_free()
352334
- name: Dump install logs
353335
shell: cmd
354336
run: cat r/check/arrow.Rcheck/00install.out

0 commit comments

Comments
 (0)