Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into numpy-2-compat-whee…
Browse files Browse the repository at this point in the history
…ls-prerelease
  • Loading branch information
jorisvandenbossche committed Apr 11, 2024
2 parents e257d49 + b3b4521 commit 74e0a93
Show file tree
Hide file tree
Showing 51 changed files with 1,598 additions and 517 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- 'cpp/**'
- 'docker-compose.yml'
- 'format/Flight.proto'
- 'testing'
pull_request:
paths:
- '.github/workflows/cpp.yml'
Expand All @@ -44,6 +45,7 @@ on:
- 'cpp/**'
- 'docker-compose.yml'
- 'format/Flight.proto'
- 'testing'

concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
Expand Down
Loading

0 comments on commit 74e0a93

Please sign in to comment.