Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
comphead authored Dec 7, 2023
2 parents 28af1b3 + b06ab13 commit d1dcf16
Show file tree
Hide file tree
Showing 26 changed files with 1,169 additions and 572 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# 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: audit

concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
on:
push:
branches:
- master
pull_request:
paths:
- '**/Cargo.toml'
- '**/Cargo.lock'

jobs:
cargo-audit:
name: Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install cargo-audit
run: cargo install cargo-audit
- name: Run audit check
run: cargo audit
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Audit licenses
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
github.event_name == 'pull_request_target' &&
(github.event.action == 'opened' ||
github.event.action == 'synchronize')
uses: actions/labeler@v4.3.0
uses: actions/labeler@v5.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/workflows/dev_pr/labeler.yml
Expand Down
51 changes: 29 additions & 22 deletions .github/workflows/dev_pr/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,40 @@
# under the License.

arrow:
- arrow-arith/**/*
- arrow-array/**/*
- arrow-buffer/**/*
- arrow-cast/**/*
- arrow-csv/**/*
- arrow-data/**/*
- arrow-flight/**/*
- arrow-integration-test/**/*
- arrow-integration-testing/**/*
- arrow-ipc/**/*
- arrow-json/**/*
- arrow-avro/**/*
- arrow-ord/**/*
- arrow-row/**/*
- arrow-schema/**/*
- arrow-select/**/*
- arrow-string/**/*
- arrow/**/*
- changed-files:
- any-glob-to-any-file:
- 'arrow-arith/**/*'
- 'arrow-array/**/*'
- 'arrow-buffer/**/*'
- 'arrow-cast/**/*'
- 'arrow-csv/**/*'
- 'arrow-data/**/*'
- 'arrow-flight/**/*'
- 'arrow-integration-test/**/*'
- 'arrow-integration-testing/**/*'
- 'arrow-ipc/**/*'
- 'arrow-json/**/*'
- 'arrow-avro/**/*'
- 'arrow-ord/**/*'
- 'arrow-row/**/*'
- 'arrow-schema/**/*'
- 'arrow-select/**/*'
- 'arrow-string/**/*'
- 'arrow/**/*'

arrow-flight:
- arrow-flight/**/*
- changed-files:
- any-glob-to-any-file:
- 'arrow-flight/**/*'

parquet:
- parquet/**/*
- changed-files:
- any-glob-to-any-file: [ 'parquet/**/*' ]

parquet-derive:
- parquet_derive/**/*
- changed-files:
- any-glob-to-any-file: [ 'parquet_derive/**/*' ]

object-store:
- object_store/**/*
- changed-files:
- any-glob-to-any-file: [ 'object_store/**/*' ]
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
path: /home/runner/target
# this key is not equal because maturin uses different compilation flags.
key: ${{ runner.os }}-${{ matrix.arch }}-target-maturin-cache-${{ matrix.rust }}-
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.8'
- name: Upgrade pip and setuptools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/parquet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
cache: "pip"
Expand Down
Loading

0 comments on commit d1dcf16

Please sign in to comment.