Skip to content

Commit 85fb619

Browse files
Merge remote-tracking branch 'upstream/main' into apachegh-41664-pretty-print-non-cpu
2 parents 9ab291d + ec28590 commit 85fb619

333 files changed

Lines changed: 8199 additions & 4477 deletions

File tree

Some content is hidden

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

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ 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="a42af01b72c28a8e1d7b48107b33e4f286a55ef6" # 2023.11.20 Release
92+
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
9393

9494
# This must be updated when we update
9595
# ci/docker/python-wheel-windows-vs2019.dockerfile.
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=2024-04-09
98+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-06-18
9999

100100
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker-compose run --rm conan".
101101
# See https://github.com/conan-io/conan-docker-tools#readme and

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/go/ @zeroshade
3838
/java/ @lidavidm
3939
/js/ @domoritz @trxcllnt
40-
/matlab/ @kevingurney @kou
40+
/matlab/ @kevingurney @kou @sgilmore10
4141
/python/pyarrow/_flight.pyx @lidavidm
4242
/python/pyarrow/**/*gandiva* @wjones127
4343
/r/ @paleolimbot @thisisnic

‎.github/workflows/go.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ jobs:
306306
run: ci/scripts/go_test.sh $(pwd)
307307

308308
macos:
309-
name: AMD64 macOS 11 Go ${{ matrix.go }}
310-
runs-on: macos-latest
309+
name: AMD64 macOS 12 Go ${{ matrix.go }}
310+
runs-on: macos-12
311311
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
312312
timeout-minutes: 60
313313
strategy:
@@ -364,8 +364,8 @@ jobs:
364364
365365
366366
macos-cgo:
367-
name: AMD64 macOS 11 Go ${{ matrix.go }} - CGO
368-
runs-on: macos-latest
367+
name: AMD64 macOS 12 Go ${{ matrix.go }} - CGO
368+
runs-on: macos-12
369369
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
370370
timeout-minutes: 60
371371
strategy:

‎.github/workflows/java.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ jobs:
105105
run: archery docker push ${{ matrix.image }}
106106

107107
macos:
108-
name: AMD64 macOS 11 Java JDK ${{ matrix.jdk }}
109-
runs-on: macos-latest
110-
if: github.event_name == 'push'
108+
name: AMD64 macOS 12 Java JDK ${{ matrix.jdk }}
109+
runs-on: macos-12
110+
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
111111
timeout-minutes: 30
112112
strategy:
113113
fail-fast: false

‎.github/workflows/java_jni.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
name: AMD64 manylinux2014 Java JNI
5555
runs-on: ubuntu-latest
5656
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
57-
timeout-minutes: 90
57+
timeout-minutes: 240
5858
steps:
5959
- name: Checkout Arrow
6060
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0

‎.github/workflows/js.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ jobs:
8181
run: archery docker push debian-js
8282

8383
macos:
84-
name: AMD64 macOS 11 NodeJS ${{ matrix.node }}
85-
runs-on: macos-latest
86-
if: github.event_name == 'push'
87-
timeout-minutes: 90
84+
name: AMD64 macOS 12 NodeJS ${{ matrix.node }}
85+
runs-on: macos-12
86+
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
87+
timeout-minutes: 30
8888
strategy:
8989
fail-fast: false
9090
matrix:
@@ -114,7 +114,8 @@ jobs:
114114
windows:
115115
name: AMD64 Windows NodeJS ${{ matrix.node }}
116116
runs-on: windows-latest
117-
if: github.event_name == 'push'
117+
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
118+
timeout-minutes: 45
118119
strategy:
119120
fail-fast: false
120121
matrix:

‎.github/workflows/release.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Release
19+
20+
on:
21+
push:
22+
tags:
23+
# Trigger workflow when a tag whose name matches the pattern
24+
# pattern "apache-arrow-{MAJOR}.{MINOR}.{PATCH}" is pushed.
25+
- "apache-arrow-[0-9]+.[0-9]+.[0-9]+"
26+
27+
permissions:
28+
contents: write
29+
30+
env:
31+
GH_TOKEN: ${{ github.token }}
32+
33+
jobs:
34+
publish:
35+
name: Publish
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 5
38+
steps:
39+
- name: Get Tag Name of Latest Release Candidate
40+
run: |
41+
rc_tag=$(gh release list --repo apache/arrow | \
42+
cut -f3 | \
43+
grep -F "${GITHUB_REF_NAME}-rc" | \
44+
head -n1)
45+
echo "Latest Release Candidate Tag: ${rc_tag}"
46+
echo "RELEASE_CANDIDATE_TAG_NAME=${rc_tag}" >> ${GITHUB_ENV}
47+
- name: Store Version and Release Candidate Number
48+
run: |
49+
version_with_rc=${RELEASE_CANDIDATE_TAG_NAME#apache-arrow-}
50+
version=${version_with_rc%-rc*}
51+
rc_num=${version_with_rc#${version}-rc}
52+
echo "VERSION_WITH_RC=${version_with_rc}" >> ${GITHUB_ENV}
53+
echo "VERSION=${version}" >> ${GITHUB_ENV}
54+
echo "RC_NUM=${rc_num}" >> ${GITHUB_ENV}
55+
- name: Download Release Candidate Artifacts
56+
run: |
57+
mkdir release_candidate_artifacts
58+
gh release download ${RELEASE_CANDIDATE_TAG_NAME} --repo apache/arrow --dir release_candidate_artifacts
59+
- name: Create Release Title
60+
run: |
61+
title="Apache Arrow ${VERSION}"
62+
echo "RELEASE_TITLE=${title}" >> ${GITHUB_ENV}
63+
# Set the release notes to "TODO" temporarily. After the release notes page
64+
# (https://arrow.apache.org/release/{VERSION}.html) is published, use
65+
# gh release edit to update the release notes to refer to the newly
66+
# pushed web page. See dev/post/post-05-update-gh-release-notes.sh
67+
- name: Create GitHub Release
68+
run: |
69+
gh release create ${GITHUB_REF_NAME} \
70+
--repo apache/arrow \
71+
--verify-tag \
72+
--title "${RELEASE_TITLE}" \
73+
--notes "TODO" \
74+
release_candidate_artifacts/*
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Release
19+
20+
on:
21+
push:
22+
tags:
23+
# Trigger workflow when a tag whose name matches the pattern
24+
# "apache-arrow-{MAJOR}.{MINOR}.{PATCH}-rc{RC_NUM}" is pushed.
25+
- "apache-arrow-[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
26+
27+
permissions:
28+
contents: write
29+
30+
env:
31+
GH_TOKEN: ${{ github.token }}
32+
33+
jobs:
34+
publish:
35+
name: Publish
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 5
38+
steps:
39+
- name: Checkout Arrow
40+
uses: actions/checkout@v4
41+
with:
42+
fetch-depth: 0
43+
- name: Store Version and Release Candidate Number
44+
run: |
45+
version_with_rc=${GITHUB_REF_NAME#apache-arrow-}
46+
version=${version_with_rc%-rc*}
47+
rc_num=${version_with_rc#${version}-rc}
48+
echo "VERSION_WITH_RC=${version_with_rc}" >> ${GITHUB_ENV}
49+
echo "VERSION=${version}" >> ${GITHUB_ENV}
50+
echo "RC_NUM=${rc_num}" >> ${GITHUB_ENV}
51+
- name: Create Release Candidate Title
52+
run: |
53+
title="Apache Arrow ${VERSION} RC${RC_NUM}"
54+
echo "RELEASE_CANDIDATE_TITLE=${title}" >> ${GITHUB_ENV}
55+
- name: Create Release Candidate Notes
56+
run: |
57+
release_notes="Release Candidate: ${VERSION} RC${RC_NUM}"
58+
echo "RELEASE_CANDIDATE_NOTES=${release_notes}" >> ${GITHUB_ENV}
59+
- name: Create Release tarball
60+
run: |
61+
cd dev/release/ && ./utils-create-release-tarball.sh ${VERSION} ${RC_NUM}
62+
echo "RELEASE_TARBALL=apache-arrow-${VERSION}.tar.gz" >> ${GITHUB_ENV}
63+
- name: Create GitHub Release
64+
run: |
65+
gh release create ${GITHUB_REF_NAME} \
66+
--verify-tag \
67+
--prerelease \
68+
--title "${RELEASE_CANDIDATE_TITLE}" \
69+
--notes "Release Notes: ${RELEASE_CANDIDATE_NOTES}" \
70+
dev/release/${RELEASE_TARBALL}

‎ci/docker/python-wheel-manylinux.dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ ENV CPYTHON_VERSION=cp38
3939
ENV PATH=/opt/python/${CPYTHON_VERSION}-${CPYTHON_VERSION}/bin:${PATH}
4040

4141
# Install CMake
42-
# AWS SDK doesn't work with CMake=3.22 due to https://gitlab.kitware.com/cmake/cmake/-/issues/22524
43-
ARG cmake=3.21.4
42+
ARG cmake=3.29.2
4443
COPY ci/scripts/install_cmake.sh arrow/ci/scripts/
4544
RUN /arrow/ci/scripts/install_cmake.sh ${arch} linux ${cmake} /usr/local
4645

‎ci/vcpkg/ports.patch‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
2-
index bdc544e9e..53f6bbc3b 100644
2+
index 7cab6f726..697ab1bb4 100644
33
--- a/ports/curl/portfile.cmake
44
+++ b/ports/curl/portfile.cmake
5-
@@ -74,9 +74,12 @@ vcpkg_cmake_configure(
6-
-DENABLE_MANUAL=OFF
5+
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
6+
-DBUILD_TESTING=OFF
7+
-DENABLE_CURL_MANUAL=OFF
78
-DCURL_CA_FALLBACK=ON
8-
-DCURL_USE_LIBPSL=OFF
99
+ -DCURL_CA_PATH=none
1010
+ -DCURL_CA_BUNDLE=none
1111
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
@@ -15,6 +15,19 @@ index bdc544e9e..53f6bbc3b 100644
1515
)
1616
vcpkg_cmake_install()
1717
vcpkg_copy_pdbs()
18+
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
19+
index a79c72a59..6b7fa6a66 100644
20+
--- a/ports/llvm/portfile.cmake
21+
+++ b/ports/llvm/portfile.cmake
22+
@@ -292,6 +292,8 @@ vcpkg_cmake_configure(
23+
${FEATURE_OPTIONS}
24+
MAYBE_UNUSED_VARIABLES
25+
COMPILER_RT_ENABLE_IOS
26+
+ BOLT_TOOLS_INSTALL_DIR
27+
+ LIBOMP_INSTALL_ALIASES
28+
)
29+
30+
vcpkg_cmake_install(ADD_BIN_TO_PATH)
1831
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
1932
index 0c7098082..c603c3653 100644
2033
--- a/ports/snappy/portfile.cmake
@@ -52,16 +65,3 @@ index 000000000..e839c93a4
5265
+ }
5366
+
5467
+ static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) {
55-
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
56-
index bf9397b66..c3112b673 100644
57-
--- a/ports/llvm/portfile.cmake
58-
+++ b/ports/llvm/portfile.cmake
59-
@@ -293,6 +293,8 @@ vcpkg_cmake_configure(
60-
${FEATURE_OPTIONS}
61-
MAYBE_UNUSED_VARIABLES
62-
COMPILER_RT_ENABLE_IOS
63-
+ BOLT_TOOLS_INSTALL_DIR
64-
+ LIBOMP_INSTALL_ALIASES
65-
)
66-
67-
vcpkg_cmake_install(ADD_BIN_TO_PATH)

0 commit comments

Comments
 (0)