Skip to content

Commit

Permalink
Merge branch 'apache:main' into msys2
Browse files Browse the repository at this point in the history
  • Loading branch information
taozuhong authored Jan 22, 2025
2 parents 088df08 + 18e66de commit a125943
Show file tree
Hide file tree
Showing 116 changed files with 1,891 additions and 784 deletions.
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

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

# Default repository to pull and push images from
REPO=apache/arrow-dev
Expand All @@ -37,14 +37,14 @@ GO=1.22.9
ARROW_MAJOR_VERSION=14
DOTNET=8.0

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

# These are used to tell tests where to find services for integration testing.
# They are valid if the services are started with the docker-compose config.
# They are valid if the services are started with the compose config.
ADBC_DREMIO_FLIGHTSQL_PASS=dremio123
ADBC_DREMIO_FLIGHTSQL_URI=grpc+tcp://localhost:32010
ADBC_DREMIO_FLIGHTSQL_USER=dremio
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ adbc.h @lidavidm

## Implementations
/c/ @lidavidm
/csharp/ @lidavidm @CurtHagenlocher
/csharp/ @CurtHagenlocher
/glib/ @kou
/java/ @lidavidm
/go/ @zeroshade
Expand Down
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,18 @@ updates:
- dependency-name: "System.*"
update-types:
- "version-update:semver-major"
- package-ecosystem: "cargo"
directory: "/rust/"
schedule:
interval: "weekly"
commit-message:
prefix: "chore(rust): "
groups:
arrow:
applies-to: version-updates
patterns:
- "arrow-*"
datafusion:
applies-to: version-updates
patterns:
- "datafusion*"
5 changes: 5 additions & 0 deletions .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ concurrency:
permissions:
contents: read

defaults:
run:
# 'bash' will expand to -eo pipefail
shell: bash

jobs:
csharp:
name: "C# ${{ matrix.os }} ${{ matrix.dotnet }}"
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ concurrency:
permissions:
contents: read

defaults:
run:
# 'bash' will expand to -eo pipefail
shell: bash

jobs:
pre-commit:
name: "pre-commit"
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/dev_adbc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: Dev ADBC

on:
pull_request:
branches:
- main
paths:
- "dev/**"
- ".github/workflows/dev_adbc.yml"
push:
paths:
- "dev/**"
- ".github/workflows/dev_adbc.yml"

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

permissions:
contents: read

defaults:
run:
shell: bash -l -eo pipefail {0}

jobs:
pre-commit:
name: "pre-commit"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false

- name: Cache Conda
uses: actions/cache@v4
with:
path: ~/conda_pkgs_dir
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
use-only-tar-bz2: false
use-mamba: true

- name: Install Dependencies
run: |
mamba install -c conda-forge \
--file ci/conda_env_dev.txt \
pytest
- name: Test
run: |
pytest -vv dev/adbc_dev/
7 changes: 6 additions & 1 deletion .github/workflows/dev_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ permissions:
issues: write
pull-requests: write

defaults:
run:
# 'bash' will expand to -eo pipefail
shell: bash

jobs:
process:
name: Process
Expand Down Expand Up @@ -58,7 +63,7 @@ jobs:
env:
PR_TITLE: ${{ github.event.pull_request.title }}
run: |
python .github/workflows/dev_pr/title_check.py $(pwd)/pr_checkout "$PR_TITLE"
python dev/adbc_dev/title_check.py $(pwd)/pr_checkout "$PR_TITLE"
# Pings make it into the commit message where they annoy the user every
# time the commit gets pushed somewhere
Expand Down
Loading

0 comments on commit a125943

Please sign in to comment.