Skip to content

Commit a125943

Browse files
authored
Merge branch 'apache:main' into msys2
2 parents 088df08 + 18e66de commit a125943

File tree

116 files changed

+1891
-784
lines changed

Some content is hidden

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

116 files changed

+1891
-784
lines changed

.env

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717

1818
# All of the following environment variables are required to set default values
19-
# for the parameters in docker-compose.yml.
19+
# for the parameters in compose.yaml.
2020

2121
# Default repository to pull and push images from
2222
REPO=apache/arrow-dev
@@ -37,14 +37,14 @@ GO=1.22.9
3737
ARROW_MAJOR_VERSION=14
3838
DOTNET=8.0
3939

40-
# Used through docker-compose.yml and serves as the default version for the
40+
# Used through compose.yaml and serves as the default version for the
4141
# ci/scripts/install_vcpkg.sh script. Keep in sync with apache/arrow .env.
4242
# When updating, also update the docs, which list the version of libpq/SQLite
4343
# that vcpkg (and hence our wheels) ship
4444
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01"
4545

4646
# These are used to tell tests where to find services for integration testing.
47-
# They are valid if the services are started with the docker-compose config.
47+
# They are valid if the services are started with the compose config.
4848
ADBC_DREMIO_FLIGHTSQL_PASS=dremio123
4949
ADBC_DREMIO_FLIGHTSQL_URI=grpc+tcp://localhost:32010
5050
ADBC_DREMIO_FLIGHTSQL_USER=dremio

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ adbc.h @lidavidm
2727

2828
## Implementations
2929
/c/ @lidavidm
30-
/csharp/ @lidavidm @CurtHagenlocher
30+
/csharp/ @CurtHagenlocher
3131
/glib/ @kou
3232
/java/ @lidavidm
3333
/go/ @zeroshade

.github/dependabot.yml

+15
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,18 @@ updates:
5151
- dependency-name: "System.*"
5252
update-types:
5353
- "version-update:semver-major"
54+
- package-ecosystem: "cargo"
55+
directory: "/rust/"
56+
schedule:
57+
interval: "weekly"
58+
commit-message:
59+
prefix: "chore(rust): "
60+
groups:
61+
arrow:
62+
applies-to: version-updates
63+
patterns:
64+
- "arrow-*"
65+
datafusion:
66+
applies-to: version-updates
67+
patterns:
68+
- "datafusion*"

.github/workflows/csharp.yml

+5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ concurrency:
3636
permissions:
3737
contents: read
3838

39+
defaults:
40+
run:
41+
# 'bash' will expand to -eo pipefail
42+
shell: bash
43+
3944
jobs:
4045
csharp:
4146
name: "C# ${{ matrix.os }} ${{ matrix.dotnet }}"

.github/workflows/dev.yml

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ concurrency:
2828
permissions:
2929
contents: read
3030

31+
defaults:
32+
run:
33+
# 'bash' will expand to -eo pipefail
34+
shell: bash
35+
3136
jobs:
3237
pre-commit:
3338
name: "pre-commit"

.github/workflows/dev_adbc.yml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Dev ADBC
19+
20+
on:
21+
pull_request:
22+
branches:
23+
- main
24+
paths:
25+
- "dev/**"
26+
- ".github/workflows/dev_adbc.yml"
27+
push:
28+
paths:
29+
- "dev/**"
30+
- ".github/workflows/dev_adbc.yml"
31+
32+
concurrency:
33+
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
34+
cancel-in-progress: true
35+
36+
permissions:
37+
contents: read
38+
39+
defaults:
40+
run:
41+
shell: bash -l -eo pipefail {0}
42+
43+
jobs:
44+
pre-commit:
45+
name: "pre-commit"
46+
runs-on: ubuntu-latest
47+
steps:
48+
- uses: actions/checkout@v4
49+
with:
50+
fetch-depth: 0
51+
persist-credentials: false
52+
53+
- name: Cache Conda
54+
uses: actions/cache@v4
55+
with:
56+
path: ~/conda_pkgs_dir
57+
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
58+
- uses: conda-incubator/setup-miniconda@v3
59+
with:
60+
miniforge-version: latest
61+
use-only-tar-bz2: false
62+
use-mamba: true
63+
64+
- name: Install Dependencies
65+
run: |
66+
mamba install -c conda-forge \
67+
--file ci/conda_env_dev.txt \
68+
pytest
69+
70+
- name: Test
71+
run: |
72+
pytest -vv dev/adbc_dev/

.github/workflows/dev_pr.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ permissions:
3131
issues: write
3232
pull-requests: write
3333

34+
defaults:
35+
run:
36+
# 'bash' will expand to -eo pipefail
37+
shell: bash
38+
3439
jobs:
3540
process:
3641
name: Process
@@ -58,7 +63,7 @@ jobs:
5863
env:
5964
PR_TITLE: ${{ github.event.pull_request.title }}
6065
run: |
61-
python .github/workflows/dev_pr/title_check.py $(pwd)/pr_checkout "$PR_TITLE"
66+
python dev/adbc_dev/title_check.py $(pwd)/pr_checkout "$PR_TITLE"
6267
6368
# Pings make it into the commit message where they annoy the user every
6469
# time the commit gets pushed somewhere

0 commit comments

Comments
 (0)