Skip to content

Commit c11ee21

Browse files
authored
Merge branch 'main' into apachegh-35460-parser
2 parents b27b054 + 464ae94 commit c11ee21

90 files changed

Lines changed: 3068 additions & 430 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.

‎.github/workflows/cpp.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
fetch-depth: 0
124124
submodules: recursive
125125
- name: Restore Docker Volumes
126-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
126+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
127127
with:
128128
path: .docker
129129
key: cpp-${{ matrix.image }}
@@ -154,7 +154,7 @@ jobs:
154154
- name: Save Docker Volumes
155155
if: ${{ !cancelled() }}
156156
continue-on-error: true
157-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
157+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
158158
with:
159159
path: .docker
160160
key: cpp-${{ matrix.image }}
@@ -262,7 +262,7 @@ jobs:
262262
run: |
263263
echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
264264
- name: Restore ccache
265-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
265+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
266266
with:
267267
path: ${{ steps.ccache-info.outputs.cache-dir }}
268268
key: cpp-ccache-macos-${{ matrix.macos-version }}
@@ -285,7 +285,7 @@ jobs:
285285
- name: Save ccache
286286
if: ${{ !cancelled() }}
287287
continue-on-error: true
288-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
288+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
289289
with:
290290
path: ${{ steps.ccache-info.outputs.cache-dir }}
291291
key: cpp-ccache-macos-${{ matrix.macos-version }}
@@ -377,7 +377,7 @@ jobs:
377377
shell: msys2 {0}
378378
run: ci/scripts/msys2_setup.sh cpp
379379
- name: Restore ccache
380-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
380+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
381381
with:
382382
path: ccache
383383
key: cpp-ccache-${{ matrix.msystem_lower}}
@@ -389,7 +389,7 @@ jobs:
389389
- name: Save ccache
390390
if: ${{ !cancelled() }}
391391
continue-on-error: true
392-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
392+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
393393
with:
394394
path: ccache
395395
key: cpp-ccache-${{ matrix.msystem_lower}}

‎.github/workflows/cpp_extra.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
fetch-depth: 0
147147
submodules: recursive
148148
- name: Restore Docker Volumes
149-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
149+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
150150
with:
151151
path: .docker
152152
key: cpp-extra-${{ matrix.image }}
@@ -175,7 +175,7 @@ jobs:
175175
- name: Save Docker Volumes
176176
if: ${{ !cancelled() }}
177177
continue-on-error: true
178-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
178+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
179179
with:
180180
path: .docker
181181
key: cpp-extra-${{ matrix.image }}
@@ -235,7 +235,7 @@ jobs:
235235
run: |
236236
ci/scripts/util_free_space.sh
237237
- name: Restore Docker Volumes
238-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
238+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
239239
with:
240240
path: .docker
241241
key: jni-${{ matrix.platform.runs-on }}
@@ -257,7 +257,7 @@ jobs:
257257
- name: Save Docker Volumes
258258
if: ${{ !cancelled() }}
259259
continue-on-error: true
260-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
260+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
261261
with:
262262
path: .docker
263263
key: jni-${{ matrix.platform.runs-on }}
@@ -312,7 +312,7 @@ jobs:
312312
run: |
313313
echo "CCACHE_DIR=${PWD}/ccache" >> ${GITHUB_ENV}
314314
- name: Restore ccache
315-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
315+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
316316
with:
317317
path: ccache
318318
key: jni-macos
@@ -358,7 +358,7 @@ jobs:
358358
- name: Save ccache
359359
if: ${{ !cancelled() }}
360360
continue-on-error: true
361-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
361+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
362362
with:
363363
path: ccache
364364
key: jni-macos
@@ -413,7 +413,7 @@ jobs:
413413
echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
414414
415415
- name: Restore ccache
416-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
416+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
417417
with:
418418
path: ${{ steps.ccache-info.outputs.cache-dir }}
419419
key: jni-windows
@@ -482,7 +482,7 @@ jobs:
482482
- name: Save ccache
483483
if: ${{ !cancelled() }}
484484
continue-on-error: true
485-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
485+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
486486
with:
487487
path: ${{ steps.ccache-info.outputs.cache-dir }}
488488
key: jni-windows
@@ -516,7 +516,7 @@ jobs:
516516
docker compose up -d dremio
517517
cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh
518518
- name: Restore Docker Volumes
519-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
519+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
520520
with:
521521
path: .docker
522522
key: ubuntu-cpp-odbc
@@ -532,7 +532,7 @@ jobs:
532532
- name: Save Docker Volumes
533533
if: ${{ !cancelled() }}
534534
continue-on-error: true
535-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
535+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
536536
with:
537537
path: .docker
538538
key: ubuntu-cpp-odbc
@@ -606,7 +606,7 @@ jobs:
606606
run: |
607607
echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
608608
- name: Restore ccache
609-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
609+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
610610
with:
611611
path: ${{ steps.ccache-info.outputs.cache-dir }}
612612
key: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ matrix.build-type }}
@@ -629,7 +629,7 @@ jobs:
629629
- name: Save ccache
630630
if: ${{ !cancelled() }}
631631
continue-on-error: true
632-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
632+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
633633
with:
634634
path: ${{ steps.ccache-info.outputs.cache-dir }}
635635
key: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ matrix.build-type }}

‎.github/workflows/cpp_windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
run: |
112112
echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
113113
- name: Restore ccache
114-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
114+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
115115
with:
116116
path: ${{ steps.ccache-info.outputs.cache-dir }}
117117
key: cpp-ccache-windows-${{ inputs.arch }}
@@ -125,7 +125,7 @@ jobs:
125125
- name: Save ccache
126126
if: ${{ !cancelled() }}
127127
continue-on-error: true
128-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
128+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
129129
with:
130130
path: ${{ steps.ccache-info.outputs.cache-dir }}
131131
key: cpp-ccache-windows-${{ inputs.arch }}

‎.github/workflows/cuda_extra.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
fetch-depth: 0
107107
submodules: recursive
108108
- name: Restore Docker Volumes
109-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
109+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
110110
with:
111111
path: .docker
112112
key: extra-${{ matrix.image }}-${{ matrix.ubuntu }}-${{ matrix.cuda }}
@@ -136,7 +136,7 @@ jobs:
136136
- name: Save Docker Volumes
137137
if: ${{ !cancelled() }}
138138
continue-on-error: true
139-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
139+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
140140
with:
141141
path: .docker
142142
key: extra-${{ matrix.image }}-${{ matrix.ubuntu }}-${{ matrix.cuda }}

‎.github/workflows/package_linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
echo "ARROW_VERSION=${version}" >> "${GITHUB_ENV}"
188188
fi
189189
- name: Restore ccache
190-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
190+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
191191
with:
192192
path: ${{ env.BUILD_DIR }}/${{ env.TARGET }}
193193
key: package-linux-${{ matrix.id }}
@@ -254,7 +254,7 @@ jobs:
254254
if: >-
255255
!cancelled()
256256
continue-on-error: true
257-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
257+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
258258
with:
259259
path: ${{ env.BUILD_DIR }}/${{ env.TARGET }}
260260
key: package-linux-${{ matrix.id }}

‎.github/workflows/python.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
fetch-depth: 0
108108
submodules: recursive
109109
- name: Restore Docker Volumes
110-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
110+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
111111
with:
112112
path: .docker
113113
key: python-${{ matrix.name }}
@@ -127,7 +127,7 @@ jobs:
127127
- name: Save Docker Volumes
128128
if: ${{ !cancelled() }}
129129
continue-on-error: true
130-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
130+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
131131
with:
132132
path: .docker
133133
key: python-${{ matrix.name }}
@@ -216,7 +216,7 @@ jobs:
216216
shell: bash
217217
run: echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
218218
- name: Restore ccache
219-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
219+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
220220
with:
221221
path: ${{ steps.ccache-info.outputs.cache-dir }}
222222
key: python-ccache-macos-${{ matrix.macos-version }}
@@ -243,7 +243,7 @@ jobs:
243243
- name: Save ccache
244244
if: ${{ !cancelled() }}
245245
continue-on-error: true
246-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
246+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
247247
with:
248248
path: ${{ steps.ccache-info.outputs.cache-dir }}
249249
key: python-ccache-macos-${{ matrix.macos-version }}
@@ -292,7 +292,7 @@ jobs:
292292
run: |
293293
echo "usr-windows-dir="$(cygpath --absolute --windows /usr)"" >> $GITHUB_OUTPUT
294294
- name: Restore ccache
295-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
295+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
296296
with:
297297
path: ${{ env.CCACHE_DIR }}
298298
key: python-ccache-windows
@@ -305,7 +305,7 @@ jobs:
305305
- name: Save ccache
306306
if: ${{ !cancelled() }}
307307
continue-on-error: true
308-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
308+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
309309
with:
310310
path: ${{ env.CCACHE_DIR }}
311311
key: python-ccache-windows

‎.github/workflows/ruby.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
fetch-depth: 0
8989
submodules: recursive
9090
- name: Restore Docker Volumes
91-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
91+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
9292
with:
9393
path: .docker
9494
key: ruby-ubuntu-${{ matrix.ubuntu }}
@@ -115,7 +115,7 @@ jobs:
115115
- name: Save Docker Volumes
116116
if: ${{ !cancelled() }}
117117
continue-on-error: true
118-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
118+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
119119
with:
120120
path: .docker
121121
key: ruby-ubuntu-${{ matrix.ubuntu }}
@@ -192,7 +192,7 @@ jobs:
192192
shell: bash
193193
run: echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
194194
- name: Restore ccache
195-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
195+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
196196
with:
197197
path: ${{ steps.ccache-info.outputs.cache-dir }}
198198
key: ruby-ccache-macos
@@ -205,7 +205,7 @@ jobs:
205205
- name: Save ccache
206206
if: ${{ !cancelled() }}
207207
continue-on-error: true
208-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
208+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
209209
with:
210210
path: ${{ steps.ccache-info.outputs.cache-dir }}
211211
key: ruby-ccache-macos
@@ -278,7 +278,7 @@ jobs:
278278
run: |
279279
ridk exec bash ci\scripts\msys2_setup.sh ruby
280280
- name: Restore ccache
281-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
281+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
282282
with:
283283
# CCACHE_DIR is set by `msys2_setup.sh`
284284
path: ${{ env.CCACHE_DIR }}
@@ -302,7 +302,7 @@ jobs:
302302
- name: Save ccache
303303
if: ${{ !cancelled() }}
304304
continue-on-error: true
305-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
305+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
306306
with:
307307
path: ${{ env.CCACHE_DIR }}
308308
key: ruby-ccache-ucrt${{ matrix.mingw-n-bits }}
@@ -415,7 +415,7 @@ jobs:
415415
run: |
416416
ci/scripts/ccache_setup.sh
417417
- name: Restore ccache
418-
uses: apache/infrastructure-actions/stash/restore@ce952724eb5210790bd5d466d70d5d60ac3e6c21
418+
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
419419
with:
420420
path: ${{ env.CCACHE_DIR }}
421421
key: ruby-ccache-msvc
@@ -467,7 +467,7 @@ jobs:
467467
- name: Save ccache
468468
if: ${{ !cancelled() }}
469469
continue-on-error: true
470-
uses: apache/infrastructure-actions/stash/save@ce952724eb5210790bd5d466d70d5d60ac3e6c21
470+
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
471471
with:
472472
path: ${{ env.CCACHE_DIR }}
473473
key: ruby-ccache-msvc

‎.github/workflows/verify_rc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ jobs:
201201
fail-fast: false
202202
matrix:
203203
runs-on:
204-
- macos-15-intel
205-
- macos-14
204+
- macos-26-intel
205+
- macos-26
206206
env:
207207
RC: ${{ needs.target.outputs.rc }}
208208
TEST_WHEELS: "1"

0 commit comments

Comments
 (0)