Skip to content

Commit fa59c5d

Browse files
xborderxborder
authored
Merge branch 'main' into GH-2714-python-oauth-options
2 parents dd2cef8 + 48d84d9 commit fa59c5d

File tree

137 files changed

+4419
-772
lines changed

Some content is hidden

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

137 files changed

+4419
-772
lines changed

‎.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ ADBC_JDBC_POSTGRESQL_DATABASE=postgres
5858
ADBC_POSTGRESQL_TEST_URI="postgresql://localhost:5432/postgres?user=postgres&password=password"
5959
ADBC_SQLITE_FLIGHTSQL_URI=grpc+tcp://localhost:8080
6060
ADBC_TEST_FLIGHTSQL_URI=grpc+tls://localhost:41414
61+
ADBC_GIZMOSQL_URI=grpc+tcp://localhost:31337
62+
ADBC_GIZMOSQL_USER=adbc_test_user
63+
ADBC_GIZMOSQL_PASSWORD=adbc_test_password
6164

6265
# OAuth test server configuration
6366
# OAuth token endpoint (oauthserver on port 8181)

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ updates:
2323
interval: "weekly"
2424
commit-message:
2525
prefix: "chore: "
26+
groups:
27+
actions:
28+
patterns:
29+
- "*"
2630
- package-ecosystem: "gomod"
2731
directory: "/go/adbc/"
2832
schedule:

‎.github/workflows/csharp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
dotnet-version: ${{ matrix.dotnet }}
6060
- name: Checkout ADBC
61-
uses: actions/checkout@v5
61+
uses: actions/checkout@v6
6262
with:
6363
fetch-depth: 0
6464
submodules: recursive

‎.github/workflows/dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
name: "pre-commit"
3939
runs-on: ubuntu-latest
4040
steps:
41-
- uses: actions/checkout@v5
41+
- uses: actions/checkout@v6
4242
with:
4343
fetch-depth: 0
4444
persist-credentials: false
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0
5959
- name: pre-commit (cache)
60-
uses: actions/cache@v4
60+
uses: actions/cache@v5
6161
with:
6262
path: ~/.cache/pre-commit
6363
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}

‎.github/workflows/dev_adbc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ jobs:
4545
name: "pre-commit"
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
with:
5050
fetch-depth: 0
5151
persist-credentials: false
5252

5353
- name: Cache Conda
54-
uses: actions/cache@v4
54+
uses: actions/cache@v5
5555
with:
5656
path: ~/conda_pkgs_dir
5757
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}

‎.github/workflows/dev_pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
name: Process
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/checkout@v5
44+
- uses: actions/checkout@v6
4545
with:
4646
persist-credentials: false
4747

@@ -52,7 +52,7 @@ jobs:
5252
run: |
5353
./.github/workflows/dev_pr/milestone.sh "${GITHUB_REPOSITORY}" ${{github.event.number}}
5454
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656
with:
5757
fetch-depth: 0
5858
path: pr_checkout

‎.github/workflows/integration.yml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
name: "DuckDB Integration Tests"
5858
runs-on: ubuntu-latest
5959
steps:
60-
- uses: actions/checkout@v5
60+
- uses: actions/checkout@v6
6161
with:
6262
fetch-depth: 0
6363
persist-credentials: false
@@ -66,7 +66,7 @@ jobs:
6666
run: |
6767
echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
6868
- name: Cache Conda
69-
uses: actions/cache/restore@v4
69+
uses: actions/cache/restore@v5
7070
with:
7171
path: ~/conda_pkgs_dir
7272
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
@@ -101,10 +101,10 @@ jobs:
101101
./ci/scripts/cpp_test.sh "$(pwd)/build"
102102
103103
flightsql:
104-
name: "FlightSQL Integration Tests (Dremio and SQLite)"
104+
name: "FlightSQL Integration Tests (Dremio, SQLite, and GizmoSQL)"
105105
runs-on: ubuntu-latest
106106
steps:
107-
- uses: actions/checkout@v5
107+
- uses: actions/checkout@v6
108108
with:
109109
fetch-depth: 0
110110
persist-credentials: false
@@ -116,7 +116,7 @@ jobs:
116116
run: |
117117
echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
118118
- name: Cache Conda
119-
uses: actions/cache/restore@v4
119+
uses: actions/cache/restore@v5
120120
with:
121121
path: ~/conda_pkgs_dir
122122
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
@@ -140,9 +140,9 @@ jobs:
140140
- name: Work around ASAN issue (GH-1617)
141141
run: |
142142
sudo sysctl vm.mmap_rnd_bits=28
143-
- name: Start SQLite server and Dremio
143+
- name: Start SQLite server, Dremio, and GizmoSQL
144144
run: |
145-
docker compose up --detach flightsql-test flightsql-sqlite-test dremio dremio-init
145+
docker compose up --detach flightsql-test flightsql-sqlite-test dremio dremio-init gizmosql-test
146146
pip install python-dotenv[cli]
147147
python -m dotenv -f .env list --format simple | tee -a $GITHUB_ENV
148148
@@ -161,22 +161,22 @@ jobs:
161161
run: |
162162
./ci/scripts/cpp_build.sh "$(pwd)" "$(pwd)/build"
163163
./ci/scripts/cpp_test.sh "$(pwd)/build"
164-
- name: Test Python Flight SQL driver against Dremio
164+
- name: Test Python Flight SQL driver against Dremio and GizmoSQL
165165
env:
166166
BUILD_ALL: "0"
167167
BUILD_DRIVER_FLIGHTSQL: "1"
168168
PYTEST_ADDOPTS: "--error-for-skips"
169169
run: |
170170
./ci/scripts/python_test.sh "$(pwd)" "$(pwd)/build"
171-
- name: Stop SQLite server and Dremio
171+
- name: Stop SQLite server, Dremio, and GizmoSQL
172172
run: |
173173
docker compose down
174174
175175
postgresql:
176176
name: "PostgreSQL Integration Tests"
177177
runs-on: ubuntu-latest
178178
steps:
179-
- uses: actions/checkout@v5
179+
- uses: actions/checkout@v6
180180
with:
181181
fetch-depth: 0
182182
persist-credentials: false
@@ -185,7 +185,7 @@ jobs:
185185
run: |
186186
echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
187187
- name: Cache Conda
188-
uses: actions/cache/restore@v4
188+
uses: actions/cache/restore@v5
189189
with:
190190
path: ~/conda_pkgs_dir
191191
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
@@ -268,12 +268,18 @@ jobs:
268268
./ci/scripts/cpp_test.sh "$(pwd)/build"
269269
./ci/scripts/python_test.sh "$(pwd)" "$(pwd)/build"
270270
docker compose down
271+
- uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
272+
- name: Run PostgreSQL Validation Suite
273+
run: |
274+
env POSTGRES_VERSION=18 docker compose up --wait --detach postgres-test
275+
env BUILD_ALL=0 BUILD_DRIVER_POSTGRESQL=1 uv --project=./c/driver/postgresql/validation/ run ci/scripts/validate.sh $(pwd)
276+
docker compose down
271277
272278
snowflake:
273279
name: "Snowflake Integration Tests"
274280
runs-on: ubuntu-latest
275281
steps:
276-
- uses: actions/checkout@v5
282+
- uses: actions/checkout@v6
277283
with:
278284
fetch-depth: 0
279285
persist-credentials: false
@@ -285,7 +291,7 @@ jobs:
285291
run: |
286292
echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
287293
- name: Cache Conda
288-
uses: actions/cache/restore@v4
294+
uses: actions/cache/restore@v5
289295
with:
290296
path: ~/conda_pkgs_dir
291297
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
@@ -330,7 +336,7 @@ jobs:
330336
name: "FlightSQL C# Interop"
331337
runs-on: ubuntu-latest
332338
steps:
333-
- uses: actions/checkout@v5
339+
- uses: actions/checkout@v6
334340
with:
335341
fetch-depth: 0
336342
persist-credentials: false

‎.github/workflows/java.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
matrix:
5151
java: ['11', '17', '21', '25']
5252
steps:
53-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5454
with:
5555
fetch-depth: 0
5656
persist-credentials: false
@@ -76,7 +76,7 @@ jobs:
7676
matrix:
7777
java: ['21', '25']
7878
steps:
79-
- uses: actions/checkout@v5
79+
- uses: actions/checkout@v6
8080
with:
8181
fetch-depth: 0
8282
persist-credentials: false
@@ -116,7 +116,7 @@ jobs:
116116
env:
117117
VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
118118
steps:
119-
- uses: actions/checkout@v5
119+
- uses: actions/checkout@v6
120120
with:
121121
fetch-depth: 0
122122
persist-credentials: false
@@ -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@v5
175+
- uses: actions/upload-artifact@v6
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@v5
188+
uses: actions/upload-artifact@v6
189189
with:
190190
name: jni-artifacts-${{ matrix.os }}-${{ matrix.arch }}
191191
retention-days: 7
@@ -204,12 +204,12 @@ jobs:
204204
- { java: '11', os: macOS, arch: arm64v8, vcpkg_arch: arm64, runner: macos-latest }
205205
- { java: '25', os: macOS, arch: arm64v8, vcpkg_arch: arm64, runner: macos-latest }
206206
steps:
207-
- uses: actions/checkout@v5
207+
- uses: actions/checkout@v6
208208
with:
209209
fetch-depth: 0
210210
persist-credentials: false
211211
submodules: recursive
212-
- uses: actions/download-artifact@v6
212+
- uses: actions/download-artifact@v7
213213
with:
214214
path: artifacts
215215
pattern: jni-artifacts-*

0 commit comments

Comments
 (0)