Skip to content

Commit ac1fb44

Browse files
author
Rafał Hibner
committed
Merge branch 'arrowPipeNoQueue' into combined
2 parents a50e12d + b2932ee commit ac1fb44

File tree

155 files changed

+3151
-3041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+3151
-3041
lines changed

‎.env‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ HDFS=3.2.1
6262
JDK=11
6363
KARTOTHEK=latest
6464
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
65-
LLVM=14
65+
LLVM=18
6666
MAVEN=3.8.7
6767
NODE=18
6868
NUMBA=latest
@@ -89,17 +89,17 @@ TZ=UTC
8989
# Used through docker-compose.yml and serves as the default version for the
9090
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9191
# docker tags more readable.
92-
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
92+
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
9393

9494
# This must be updated when we update
95-
# ci/docker/python-*-windows-*.dockerfile.
95+
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
9696
# This is a workaround for our CI problem that "archery docker build" doesn't
9797
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
98-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-01-08
99-
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-08
98+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-02-03
99+
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-27
100100

101101
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
102102
# See https://github.com/conan-io/conan-docker-tools#readme and
103103
# https://hub.docker.com/u/conanio for available images.
104-
CONAN_BASE=gcc10
105-
CONAN_VERSION=1.62.0
104+
CONAN_BASE=gcc11-ubuntu16.04
105+
CONAN_VERSION=2.12.1

‎.github/workflows/archery.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
shell: bash
6666
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
6767
- name: Setup Python
68-
uses: actions/setup-python@v5.3.0
68+
uses: actions/setup-python@v5.4.0
6969
with:
7070
python-version: '3.9'
7171
- name: Install pygit2 binary wheel

‎.github/workflows/comment_bot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# fetch the tags for version number generation
4343
fetch-depth: 0
4444
- name: Set up Python
45-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
45+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
4646
with:
4747
python-version: 3.12
4848
- name: Install Archery and Crossbow dependencies

‎.github/workflows/cpp.yml‎

Lines changed: 26 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -69,65 +69,37 @@ env:
6969
DOCKER_VOLUME_PREFIX: ".docker/"
7070

7171
jobs:
72-
docker-targets:
73-
name: Docker targets
74-
runs-on: ubuntu-latest
75-
outputs:
76-
targets: ${{ steps.detect-targets.outputs.targets }}
77-
steps:
78-
- name: Detect targets
79-
id: detect-targets
80-
run: |
81-
echo "targets<<JSON" >> "$GITHUB_OUTPUT"
82-
echo "[" >> "$GITHUB_OUTPUT"
83-
cat <<JSON >> "$GITHUB_OUTPUT"
84-
{
85-
"arch": "amd64",
86-
"clang-tools": "14",
87-
"image": "conda-cpp",
88-
"llvm": "14",
89-
"runs-on": "ubuntu-latest",
90-
"simd-level": "AVX2",
91-
"title": "AMD64 Conda C++ AVX2",
92-
"ubuntu": "22.04"
93-
},
94-
{
95-
"arch": "amd64",
96-
"clang-tools": "14",
97-
"image": "ubuntu-cpp-sanitizer",
98-
"llvm": "14",
99-
"runs-on": "ubuntu-latest",
100-
"title": "AMD64 Ubuntu 22.04 C++ ASAN UBSAN",
101-
"ubuntu": "22.04"
102-
}
103-
JSON
104-
if [ "$GITHUB_REPOSITORY_OWNER" = "apache" ]; then
105-
echo "," >> "$GITHUB_OUTPUT"
106-
cat <<JSON >> "$GITHUB_OUTPUT"
107-
{
108-
"arch": "arm64v8",
109-
"clang-tools": "10",
110-
"image": "ubuntu-cpp",
111-
"llvm": "10",
112-
"runs-on": ["self-hosted", "arm", "linux"],
113-
"title": "ARM64 Ubuntu 20.04 C++",
114-
"ubuntu": "20.04"
115-
}
116-
JSON
117-
fi
118-
echo "]" >> "$GITHUB_OUTPUT"
119-
echo "JSON" >> "$GITHUB_OUTPUT"
120-
12172
docker:
12273
name: ${{ matrix.title }}
123-
needs: docker-targets
12474
runs-on: ${{ matrix.runs-on }}
12575
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
12676
timeout-minutes: 75
12777
strategy:
12878
fail-fast: false
12979
matrix:
130-
include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
80+
include:
81+
- arch: amd64
82+
clang-tools: 14
83+
image: conda-cpp
84+
llvm: 14
85+
runs-on: ubuntu-latest
86+
simd-level: AVX2
87+
title: AMD64 Conda C++ AVX2
88+
ubuntu: 22.04
89+
- arch: amd64
90+
clang-tools: 14
91+
image: ubuntu-cpp-sanitizer
92+
llvm: 14
93+
runs-on: ubuntu-latest
94+
title: AMD64 Ubuntu 22.04 C++ ASAN UBSAN
95+
ubuntu: 22.04
96+
- arch: arm64v8
97+
clang-tools: 10
98+
image: ubuntu-cpp
99+
llvm: 10
100+
runs-on: ubuntu-24.04-arm
101+
title: ARM64 Ubuntu 20.04 C++
102+
ubuntu: 20.04
131103
env:
132104
ARCH: ${{ matrix.arch }}
133105
ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
@@ -149,7 +121,7 @@ jobs:
149121
- name: Setup Python on hosted runner
150122
if: |
151123
matrix.runs-on == 'ubuntu-latest'
152-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
124+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
153125
with:
154126
python-version: 3
155127
- name: Setup Python on self-hosted runner
@@ -262,7 +234,7 @@ jobs:
262234
$(brew --prefix bash)/bin/bash \
263235
ci/scripts/install_minio.sh latest ${ARROW_HOME}
264236
- name: Set up Python
265-
uses: actions/setup-python@v5.3.0
237+
uses: actions/setup-python@v5.4.0
266238
with:
267239
python-version: 3.12
268240
- name: Install Google Cloud Storage Testbench
@@ -481,7 +453,7 @@ jobs:
481453
https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2024-09-13T20-26-02Z
482454
chmod +x /usr/local/bin/minio.exe
483455
- name: Set up Python
484-
uses: actions/setup-python@v5.3.0
456+
uses: actions/setup-python@v5.4.0
485457
id: python-install
486458
with:
487459
python-version: 3.9

‎.github/workflows/csharp.yml‎

Lines changed: 90 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
dotnet: ['8.0.x']
5555
steps:
5656
- name: Install C#
57-
uses: actions/setup-dotnet@v4.2.0
57+
uses: actions/setup-dotnet@v4.3.0
5858
with:
5959
dotnet-version: ${{ matrix.dotnet }}
6060
- name: Setup Python
61-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
61+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
6262
with:
6363
python-version: 3
6464
- name: Checkout Arrow
@@ -86,7 +86,7 @@ jobs:
8686
dotnet: ['8.0.x']
8787
steps:
8888
- name: Install C#
89-
uses: actions/setup-dotnet@v4.2.0
89+
uses: actions/setup-dotnet@v4.3.0
9090
with:
9191
dotnet-version: ${{ matrix.dotnet }}
9292
- name: Checkout Arrow
@@ -113,11 +113,11 @@ jobs:
113113
dotnet: ['8.0.x']
114114
steps:
115115
- name: Install C#
116-
uses: actions/setup-dotnet@v4.2.0
116+
uses: actions/setup-dotnet@v4.3.0
117117
with:
118118
dotnet-version: ${{ matrix.dotnet }}
119119
- name: Setup Python
120-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
120+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
121121
with:
122122
python-version: 3.12
123123
- name: Checkout Arrow
@@ -133,3 +133,88 @@ jobs:
133133
- name: Test
134134
shell: bash
135135
run: ci/scripts/csharp_test.sh $(pwd)
136+
137+
package:
138+
name: Package
139+
# Branch or RC tag
140+
if: github.ref_type != 'tag' || contains(github.ref_name, 'rc')
141+
runs-on: ubuntu-latest
142+
timeout-minutes: 15
143+
permissions:
144+
contents: write
145+
steps:
146+
- name: Checkout for utilities
147+
if: github.ref_type == 'tag'
148+
uses: actions/checkout@v4
149+
with:
150+
path: arrow
151+
- name: Download source archive
152+
if: github.ref_type == 'tag'
153+
run: |
154+
arrow/dev/release/utils-watch-gh-workflow.sh \
155+
${GITHUB_REF_NAME} \
156+
release_candidate.yml
157+
gh release download ${GITHUB_REF_NAME} \
158+
--pattern "*.tar.gz" \
159+
--repo ${GITHUB_REPOSITORY}
160+
tar -xf *.tar.gz --strip-components=1
161+
mv csharp/dummy.git .git
162+
env:
163+
GH_TOKEN: ${{ github.token }}
164+
- name: Checkout
165+
if: github.ref_type != 'tag'
166+
uses: actions/checkout@v4
167+
with:
168+
fetch-depth: 0
169+
- name: Prepare version
170+
if: github.ref_type != 'tag'
171+
run: |
172+
# apache-arrow-20.0.0.dev-9-g758867f907 ->
173+
# 20.0.0.dev-9-g758867f907 ->
174+
# 20.0.0.dev-9 ->
175+
# 20.0.0-dev-9
176+
semver="$(git describe --tags | \
177+
sed -E \
178+
-e 's/^apache-arrow-//' \
179+
-e 's/-[^-]*$//' \
180+
-e 's/^([0-9]*\.[0-9]*\.[0-9])\./\1-/')"
181+
sed -i'' -E -e \
182+
"s/^ <Version>.+<\/Version>/ <Version>${semver}<\/Version>/" \
183+
csharp/Directory.Build.props
184+
- name: Setup Python
185+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
186+
with:
187+
python-version: 3
188+
- name: Setup Archery
189+
run: |
190+
python3 -m pip install -e 'dev/archery[docker]'
191+
- name: Build
192+
run: |
193+
archery docker run ubuntu-csharp
194+
- name: Prepare artifacts
195+
run: |
196+
shopt -s globstar
197+
cp csharp/artifacts/**/*.{,s}nupkg ./
198+
for artifact in *.{,s}nupkg; do
199+
dev/release/utils-generate-checksum.sh "${artifact}"
200+
done
201+
- name: Upload
202+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
203+
with:
204+
name: nuget
205+
path: |
206+
*.nupkg
207+
*.sha256
208+
*.sha512
209+
*.snupkg
210+
- name: Publish
211+
if: github.ref_type == 'tag'
212+
run: |
213+
gh release upload ${GITHUB_REF_NAME} \
214+
--repo ${GITHUB_REPOSITORY} \
215+
*.nupkg \
216+
*.sha256 \
217+
*.sha512 \
218+
*.snupkg
219+
env:
220+
GH_TOKEN: ${{ github.token }}

‎.github/workflows/dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
with:
5151
fetch-depth: 0
5252
- name: Setup Python
53-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
53+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
5454
with:
5555
python-version: 3.12
5656
- name: Install pre-commit
@@ -109,15 +109,15 @@ jobs:
109109
with:
110110
fetch-depth: 0
111111
- name: Install Python
112-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
112+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
113113
with:
114114
python-version: '3.12'
115115
- name: Install Ruby
116116
uses: ruby/setup-ruby@v1
117117
with:
118118
ruby-version: ruby
119119
- name: Install .NET
120-
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
120+
uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
121121
with:
122122
dotnet-version: '8.0.x'
123123
- name: Install Dependencies

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
key: debian-docs-${{ hashFiles('cpp/**') }}
5353
restore-keys: debian-docs-
5454
- name: Setup Python
55-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
55+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
5656
with:
5757
python-version: 3.12
5858
- name: Setup Archery

‎.github/workflows/docs_light.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
key: conda-docs-${{ hashFiles('cpp/**') }}
6060
restore-keys: conda-docs-
6161
- name: Setup Python
62-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
62+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
6363
with:
6464
python-version: 3.12
6565
- name: Setup Archery

‎.github/workflows/integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
key: conda-${{ hashFiles('cpp/**') }}
107107
restore-keys: conda-
108108
- name: Setup Python
109-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
109+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
110110
with:
111111
python-version: 3.12
112112
- name: Setup Archery

‎.github/workflows/js.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
with:
6262
fetch-depth: 0
6363
- name: Setup Python
64-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
64+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
6565
with:
6666
python-version: 3.12
6767
- name: Setup Archery

0 commit comments

Comments
 (0)