Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into apachegh-37437-make…
Browse files Browse the repository at this point in the history
…arrayofnulls
  • Loading branch information
jorisvandenbossche committed Sep 29, 2023
2 parents ca92fb6 + a004102 commit c22dc3f
Show file tree
Hide file tree
Showing 814 changed files with 29,759 additions and 8,101 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ CUDA=11.0.3
DASK=latest
DOTNET=7.0
GCC_VERSION=""
GO=1.17
STATICCHECK=v0.2.2
GO=1.19.13
STATICCHECK=v0.4.5
HDFS=3.2.1
JDK=8
KARTOTHEK=latest
Expand Down
8 changes: 5 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
cpp/src/arrow/util/bpacking_*_generated.h linguist-generated=true
cpp/src/generated/*.cpp linguist-generated=true
cpp/src/generated/*.h linguist-generated=true
go/**/*.s linguist-generated=true
go/arrow/unionmode_string.go linguist-generated=true
r/R/RcppExports.R linguist-generated=true
r/R/arrowExports.R linguist-generated=true
r/src/RcppExports.cpp linguist-generated=true
r/src/arrowExports.cpp linguist-generated=true
r/man/*.Rd linguist-generated=true
cpp/src/generated/*.h linguist-generated=true
r/NEWS.md merge=union
go/**/*.s linguist-generated=true
go/arrow/unionmode_string.go linguist-generated=true
2 changes: 1 addition & 1 deletion .github/workflows/archery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
timeout-minutes: 15
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Git Fixup
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/comment_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: arrow
# fetch the tags for version number generation
Expand All @@ -60,7 +60,7 @@ jobs:
if: startsWith(github.event.comment.body, '@github-actions autotune')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: r-lib/actions/pr-fetch@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
if: startsWith(github.event.comment.body, '@github-actions rebase')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: r-lib/actions/pr-fetch@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ on:
- 'ci/scripts/msys2_*'
- 'ci/scripts/util_*'
- 'cpp/**'
- 'docker-compose.yml'
- 'format/Flight.proto'
pull_request:
paths:
Expand All @@ -41,6 +42,7 @@ on:
- 'ci/scripts/msys2_*'
- 'ci/scripts/util_*'
- 'cpp/**'
- 'docker-compose.yml'
- 'format/Flight.proto'

concurrency:
Expand Down Expand Up @@ -94,7 +96,7 @@ jobs:
UBUNTU: ${{ matrix.ubuntu }}
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -136,7 +138,7 @@ jobs:
timeout-minutes: 45
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -167,6 +169,7 @@ jobs:
ARROW_ORC: ON
ARROW_PARQUET: ON
ARROW_S3: ON
ARROW_SUBSTRAIT: ON
ARROW_WITH_BROTLI: ON
ARROW_WITH_BZ2: ON
ARROW_WITH_LZ4: ON
Expand All @@ -183,7 +186,7 @@ jobs:
sysctl -a | grep cpu
sysctl -a | grep "hw.optional"
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -257,6 +260,7 @@ jobs:
ARROW_ORC: ON
ARROW_PARQUET: ON
ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
ARROW_SUBSTRAIT: ON
ARROW_USE_GLOG: OFF
ARROW_VERBOSE_THIRDPARTY_BUILD: OFF
ARROW_WITH_BROTLI: OFF
Expand Down Expand Up @@ -286,7 +290,7 @@ jobs:
- name: Install Dependencies
run: choco install -y --no-progress openssl
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -358,6 +362,7 @@ jobs:
ARROW_JEMALLOC: OFF
ARROW_PARQUET: ON
ARROW_S3: ON
ARROW_SUBSTRAIT: ON
ARROW_USE_GLOG: OFF
ARROW_VERBOSE_THIRDPARTY_BUILD: OFF
ARROW_WITH_BROTLI: ON
Expand Down Expand Up @@ -388,7 +393,7 @@ jobs:
/d 1 `
/f
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Source Link
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Source Link
Expand All @@ -108,7 +108,7 @@ jobs:
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Source Link
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Python
Expand Down Expand Up @@ -70,21 +70,21 @@ jobs:
name: Source Release and Merge Script on ${{ matrix.runs-on }}
runs-on: ${{ matrix.runs-on }}
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 10
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
runs-on:
- macos-latest
- ubuntu-latest
env:
GIT_AUTHOR_NAME: Github Actions
GIT_AUTHOR_EMAIL: github@actions
GIT_COMMITTER_NAME: Github Actions
GIT_COMMITTER_EMAIL: github@actions
GIT_AUTHOR_NAME: "github-actions[bot]"
GIT_AUTHOR_EMAIL: "github-actions[bot]@users.noreply.github.com"
GIT_COMMITTER_NAME: "github-actions[bot]"
GIT_COMMITTER_EMAIL: "github-actions[bot]@users.noreply.github.com"
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Python
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 @@ -43,7 +43,7 @@ jobs:
name: Process
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: apache/arrow
ref: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
UBUNTU: "22.04"
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Free up disk space
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/docs_light.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ on:
- 'ci/docker/conda-python.dockerfile'
- 'ci/scripts/cpp_build.sh'
- 'ci/scripts/python_build.sh'
- 'docker-compose.yml'

permissions:
contents: read
Expand All @@ -46,7 +47,7 @@ jobs:
PYTHON: "3.9"
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Cache Docker Volumes
Expand Down

0 comments on commit c22dc3f

Please sign in to comment.