Skip to content

Commit 7bbb615

Browse files
authored
Merge branch 'apache:main' into databricks-adbc-telemetry-lld
2 parents f46d741 + 5be5ca7 commit 7bbb615

File tree

56 files changed

+3749
-352
lines changed

Some content is hidden

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

56 files changed

+3749
-352
lines changed

.github/workflows/java.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
strategy:
5050
matrix:
51-
java: ['11', '17', '21', '24']
51+
java: ['11', '17', '21', '25']
5252
steps:
5353
- uses: actions/checkout@v5
5454
with:
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575
strategy:
7676
matrix:
77-
java: ['17', '21']
77+
java: ['21', '25']
7878
steps:
7979
- uses: actions/checkout@v5
8080
with:
@@ -172,7 +172,7 @@ jobs:
172172
ls -laR artifacts
173173
mv artifacts artifacts-${{ matrix.os }}-${{ matrix.arch }}
174174
tar czf artifacts-${{ matrix.os }}-${{ matrix.arch }}.tgz artifacts-${{ matrix.os }}-${{ matrix.arch }}
175-
- uses: actions/upload-artifact@v4
175+
- uses: actions/upload-artifact@v5
176176
with:
177177
name: jni-artifacts-${{ matrix.os }}-${{ matrix.arch }}
178178
retention-days: 7
@@ -185,7 +185,7 @@ jobs:
185185
find "$VCPKG_ROOT" -name 'build-*.log' -exec cp '{}' ~/logs ';'
186186
- name: Upload failure logs
187187
if: failure()
188-
uses: actions/upload-artifact@v4
188+
uses: actions/upload-artifact@v5
189189
with:
190190
name: jni-artifacts-${{ matrix.os }}-${{ matrix.arch }}
191191
retention-days: 7
@@ -198,17 +198,18 @@ jobs:
198198
- java-jni-artifacts
199199
strategy:
200200
matrix:
201-
java: ['11', '24']
202201
include:
203-
- { os: Linux, arch: amd64, vcpkg_arch: x64, runner: ubuntu-latest }
204-
- { os: macOS, arch: arm64v8, vcpkg_arch: arm64, runner: macos-latest }
202+
- { java: '11', os: Linux, arch: amd64, vcpkg_arch: x64, runner: ubuntu-latest }
203+
- { java: '25', os: Linux, arch: amd64, vcpkg_arch: x64, runner: ubuntu-latest }
204+
- { java: '11', os: macOS, arch: arm64v8, vcpkg_arch: arm64, runner: macos-latest }
205+
- { java: '25', os: macOS, arch: arm64v8, vcpkg_arch: arm64, runner: macos-latest }
205206
steps:
206207
- uses: actions/checkout@v5
207208
with:
208209
fetch-depth: 0
209210
persist-credentials: false
210211
submodules: recursive
211-
- uses: actions/download-artifact@v5
212+
- uses: actions/download-artifact@v6
212213
with:
213214
path: artifacts
214215
pattern: jni-artifacts-*

.github/workflows/native-unix.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
cd
142142
tar czf ~/local.tgz local
143143
144-
- uses: actions/upload-artifact@v4
144+
- uses: actions/upload-artifact@v5
145145
with:
146146
name: driver-manager-${{ matrix.os }}
147147
retention-days: 3
@@ -357,7 +357,7 @@ jobs:
357357
run: |
358358
sudo sysctl vm.mmap_rnd_bits=28
359359
360-
- uses: actions/download-artifact@v5
360+
- uses: actions/download-artifact@v6
361361
with:
362362
name: driver-manager-${{ matrix.os }}
363363
path: "~"
@@ -506,7 +506,7 @@ jobs:
506506
if: matrix.os == 'ubuntu-latest'
507507
run: go install honnef.co/go/tools/cmd/staticcheck@latest
508508

509-
- uses: actions/download-artifact@v5
509+
- uses: actions/download-artifact@v6
510510
with:
511511
name: driver-manager-${{ matrix.os }}
512512
path: "~"
@@ -544,7 +544,7 @@ jobs:
544544
strategy:
545545
matrix:
546546
os: ["macos-15-intel", "macos-latest", "ubuntu-latest"]
547-
python: ["3.10", "3.13"]
547+
python: ["3.10", "3.14"]
548548
env:
549549
# Required for macOS
550550
# https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
@@ -588,7 +588,7 @@ jobs:
588588
cache: true
589589
cache-dependency-path: go/adbc/go.sum
590590

591-
- uses: actions/download-artifact@v5
591+
- uses: actions/download-artifact@v6
592592
with:
593593
name: driver-manager-${{ matrix.os }}
594594
path: "~"
@@ -668,7 +668,7 @@ jobs:
668668
strategy:
669669
matrix:
670670
os: ["ubuntu-latest"]
671-
python: ["3.13"]
671+
python: ["3.14"]
672672
steps:
673673
- uses: actions/checkout@v5
674674
with:
@@ -699,7 +699,7 @@ jobs:
699699
run: |
700700
sudo sysctl vm.mmap_rnd_bits=28
701701
702-
- uses: actions/download-artifact@v5
702+
- uses: actions/download-artifact@v6
703703
with:
704704
name: driver-manager-${{ matrix.os }}
705705
path: "~"
@@ -721,7 +721,7 @@ jobs:
721721
run: |
722722
./ci/scripts/docs_build.sh "$(pwd)"
723723
- name: Archive docs
724-
uses: actions/upload-artifact@v4
724+
uses: actions/upload-artifact@v5
725725
with:
726726
name: docs
727727
retention-days: 2

.github/workflows/native-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
run: |
104104
.\ci\scripts\cpp_build.ps1 $pwd ${{ github.workspace }}\build
105105
106-
- uses: actions/upload-artifact@v4
106+
- uses: actions/upload-artifact@v5
107107
with:
108108
name: driver-manager-${{ matrix.os }}
109109
retention-days: 3
@@ -224,7 +224,7 @@ jobs:
224224
cache: true
225225
cache-dependency-path: go/adbc/go.sum
226226

227-
- uses: actions/download-artifact@v5
227+
- uses: actions/download-artifact@v6
228228
with:
229229
name: driver-manager-${{ matrix.os }}
230230
path: ${{ github.workspace }}/build
@@ -254,7 +254,7 @@ jobs:
254254
strategy:
255255
matrix:
256256
os: ["windows-latest"]
257-
python: ["3.10", "3.13"]
257+
python: ["3.10", "3.14"]
258258
steps:
259259
- uses: actions/checkout@v5
260260
with:
@@ -284,7 +284,7 @@ jobs:
284284
--file ci\conda_env_cpp.txt `
285285
--file ci\conda_env_python.txt
286286
287-
- uses: actions/download-artifact@v5
287+
- uses: actions/download-artifact@v6
288288
with:
289289
name: driver-manager-${{ matrix.os }}
290290
path: ${{ github.workspace }}/build

.github/workflows/nightly-verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
shasum --algorithm 512 \
9999
apache-arrow-adbc-${VERSION}.tar.gz > apache-arrow-adbc-${VERSION}.tar.gz.sha512
100100
101-
- uses: actions/upload-artifact@v4
101+
- uses: actions/upload-artifact@v5
102102
with:
103103
name: source
104104
retention-days: 7
@@ -130,7 +130,7 @@ jobs:
130130
grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
131131
echo "VERSION=${VERSION}" >> $GITHUB_ENV
132132
133-
- uses: actions/download-artifact@v5
133+
- uses: actions/download-artifact@v6
134134
with:
135135
name: source
136136
path: ${{ github.workspace }}/apache-arrow-adbc-${{ env.VERSION }}-rc0/

.github/workflows/nightly-website.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
docker compose run docs
5151
- name: Archive docs
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v5
5353
with:
5454
name: docs
5555
retention-days: 2
@@ -74,7 +74,7 @@ jobs:
7474
path: scripts
7575
persist-credentials: false
7676
- name: Download docs
77-
uses: actions/download-artifact@v5
77+
uses: actions/download-artifact@v6
7878
with:
7979
name: docs
8080
path: temp

0 commit comments

Comments
 (0)