Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into pandas-compat-const…
Browse files Browse the repository at this point in the history
…ructor
  • Loading branch information
jorisvandenbossche committed Apr 11, 2024
2 parents 6dee245 + b3b4521 commit 3dd79ff
Show file tree
Hide file tree
Showing 23 changed files with 873 additions and 105 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 3dd79ff

Please sign in to comment.