Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ jobs:
run: ci/scripts/csharp_test.sh $(pwd)

macos:
name: AMD64 macOS 13 C# ${{ matrix.dotnet }}
runs-on: macos-13 # Pending https://github.com/pythonnet/pythonnet/issues/2396
name: AMD64 macOS 15 C# ${{ matrix.dotnet }}
runs-on: macos-15-intel
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 15
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_review_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Upload PR review Payload"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: "${{ github.event_path }}"
name: "pr_review_payload"
6 changes: 3 additions & 3 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:
if: always()
- name: Save the test output
if: always()
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
uses: actions/upload-artifact@v4
with:
name: test-output
path: r/check/arrow.Rcheck/tests/testthat.Rout*
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
if: always()
- name: Save the test output
if: always()
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
uses: actions/upload-artifact@v4
with:
name: test-output
path: r/check/arrow.Rcheck/tests/testthat.Rout*
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
# So that they're unique when multiple are downloaded in the next step
shell: bash
run: mv libarrow.zip libarrow-rtools${{ matrix.config.rtools }}-${{ matrix.config.arch }}.zip
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: libarrow-rtools${{ matrix.config.rtools }}-${{ matrix.config.arch }}.zip
path: libarrow-rtools${{ matrix.config.rtools }}-${{ matrix.config.arch }}.zip
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/docker-tests/github.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
done
- name: Save the R test output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-output
path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
Expand Down
63 changes: 18 additions & 45 deletions dev/tasks/java-jars/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Compress into single artifact to keep directory structure
run: tar -cvzf arrow-shared-libs-linux-{{ arch }}.tar.gz arrow/java-dist/
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ubuntu-shared-lib-{{ arch }}
path: arrow-shared-libs-linux-{{ arch }}.tar.gz
Expand All @@ -93,7 +93,7 @@ jobs:
fail-fast: false
matrix:
platform:
- { runs_on: ["macos-13"], arch: "x86_64"}
- { runs_on: ["macos-15-intel"], arch: "x86_64"}
env:
MACOSX_DEPLOYMENT_TARGET: "12.0"
steps:
Expand Down Expand Up @@ -150,6 +150,19 @@ jobs:
# used on test We uninstall Homebrew's Protobuf to ensure using
# bundled Protobuf.
brew uninstall protobuf
# fix cmake and boost versions
brew uninstall -f boost || true
brew uninstall -f cmake || true
mkdir -p homebrew-custom/Formula
curl -o homebrew-custom/Formula/cmake.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/f68532bfe5cb87474093df8a839c3818c6aa44dd/Formula/c/cmake.rb
curl -o homebrew-custom/Formula/boost.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/23f9c56c5075dd56b4471e2c93f89f6400b49ddd/Formula/b/boost.rb
brew tap-new local/homebrew-custom
cp ./homebrew-custom/Formula/*.rb "$(brew --repo local/homebrew-custom)/Formula/"
brew install -v local/homebrew-custom/cmake
brew install -v local/homebrew-custom/boost
brew pin cmake
brew pin boost
#

brew bundle --file=arrow/java/Brewfile
- name: Build C++ libraries
Expand All @@ -166,61 +179,26 @@ jobs:
- name: Compress into single artifact to keep directory structure
run: tar -cvzf arrow-shared-libs-macos-{{ arch }}.tar.gz arrow/java-dist/
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-shared-lib-{{ arch }}
path: arrow-shared-libs-macos-{{ arch }}.tar.gz

build-cpp-windows:
name: Build C++ libraries Windows
runs-on: windows-2019
steps:
{{ macros.github_checkout_arrow()|indent }}
- name: Set up Java
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
- name: Download Timezone Database
shell: bash
run: arrow/ci/scripts/download_tz_database.sh
- name: Install sccache
shell: bash
run: arrow/ci/scripts/install_sccache.sh pc-windows-msvc $(pwd)/sccache
- name: Build C++ libraries
shell: cmd
env:
{{ macros.github_set_sccache_envvars()|indent(8) }}
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
REM For ORC
set TZDIR=/c/msys64/usr/share/zoneinfo
bash -c "arrow/ci/scripts/java_jni_windows_build.sh $(pwd)/arrow $(pwd)/arrow/cpp-build $(pwd)/arrow/java-dist"
- name: Compress into single artifact to keep directory structure
shell: bash
run: tar -cvzf arrow-shared-libs-windows.tar.gz arrow/java-dist/
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: windows-shared-lib
path: arrow-shared-libs-windows.tar.gz

package-jars:
name: Build jar files
runs-on: {{ '${{ matrix.platform.runs_on }}' }}
strategy:
fail-fast: false
matrix:
platform:
- { runs_on: ["macos-13"], arch: "x86_64"}
- { runs_on: ["macos-15-intel"], arch: "x86_64"}
needs:
- build-cpp-ubuntu
- build-cpp-macos
- build-cpp-windows
steps:
{{ macros.github_checkout_arrow(fetch_depth=0)|indent }}
- name: Download Libraries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts
- name: Decompress artifacts
Expand All @@ -229,7 +207,6 @@ jobs:
tar -xvzf arrow-shared-libs-linux-x86_64.tar.gz
tar -xvzf arrow-shared-libs-linux-aarch_64.tar.gz
tar -xvzf arrow-shared-libs-macos-x86_64.tar.gz
tar -xvzf arrow-shared-libs-windows.tar.gz
- name: Test that shared libraries exist
run: |
set -x
Expand All @@ -248,10 +225,6 @@ jobs:
test -f arrow/java-dist/arrow_dataset_jni/x86_64/libarrow_dataset_jni.dylib
test -f arrow/java-dist/arrow_orc_jni/x86_64/libarrow_orc_jni.dylib
test -f arrow/java-dist/gandiva_jni/x86_64/libgandiva_jni.dylib

test -f arrow/java-dist/arrow_cdata_jni/x86_64/arrow_cdata_jni.dll
test -f arrow/java-dist/arrow_dataset_jni/x86_64/arrow_dataset_jni.dll
test -f arrow/java-dist/arrow_orc_jni/x86_64/arrow_orc_jni.dll
- name: Build bundled jar
env:
MAVEN_ARGS: >-
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/python-wheels/github.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
shell: bash
run: archery docker run -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }} python-wheel-manylinux-{{ manylinux_version }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheel
path: arrow/python/repaired_wheels/*.whl
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/python-wheels/github.osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
pip install --upgrade pip wheel
PYTHON=python arrow/ci/scripts/python_wheel_macos_build.sh {{ arch }} $(pwd)/arrow $(pwd)/build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheel
path: arrow/python/repaired_wheels/*.whl
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/python-wheels/github.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
)
archery docker run --no-build -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }} python-wheel-windows-vs2019

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheel
path: arrow/python/dist/*.whl
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/r/github.devdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
EOF
shell: bash -l {0}
- name: Save the install script
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: {{ "devdocs-script_os-${{ matrix.os }}_sysinstall-${{ matrix.system-install }}" }}
path: arrow/r/vignettes/developers/script.sh
Expand Down
4 changes: 2 additions & 2 deletions dev/tasks/r/github.linux.arrow.version.back.compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash

- name: Upload the parquet artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: files
path: arrow/r/extra-tests/files
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
cp arrow/r/extra-tests/helper*.R extra-tests/
cp arrow/r/extra-tests/test-*.R extra-tests/
- name: Download artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: files
path: extra-tests/files
Expand Down
4 changes: 2 additions & 2 deletions dev/tasks/r/github.linux.cran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
if: always()
- name: Save the test output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-output
name: test-output-{{ "${{ matrix.r_image }}" }}
path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
6 changes: 3 additions & 3 deletions dev/tasks/r/github.linux.offline.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
R -e "source('R/install-arrow.R'); create_package_with_all_dependencies(dest_file = 'arrow_with_deps.tar.gz', source_file = \"${built_tar}\")"
shell: bash
- name: Upload the third party dependency artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: thirdparty_deps
path: arrow/r/arrow_with_deps.tar.gz
Expand All @@ -60,7 +60,7 @@ jobs:

- uses: r-lib/actions/setup-r@v2
- name: Download artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: thirdparty_deps
path: arrow/r/
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
run: cat arrow-tests/testthat.Rout*
if: always()
- name: Save the test output
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-output
path: arrow-tests/testthat.Rout*
Expand Down
4 changes: 2 additions & 2 deletions dev/tasks/r/github.linux.versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
if: always()
- name: Save the test output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-output
name: test-output-{{ "${{ matrix.r_version }}" }}
path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
4 changes: 2 additions & 2 deletions dev/tasks/r/github.macos-linux.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ jobs:
run: cat arrow-tests/testthat.Rout*
if: failure()
- name: Save the test output
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-output
name: test-output-{{ "${{ matrix.os }}" }}
path: arrow-tests/testthat.Rout*
if: always()
18 changes: 9 additions & 9 deletions dev/tasks/r/github.packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
R CMD build --no-build-vignettes .

- name: Upload package artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: r-pkg__src__contrib
path: arrow/r/arrow_*.tar.gz
Expand All @@ -66,7 +66,7 @@ jobs:
fail-fast: false
matrix:
platform:
- { runs_on: macos-13, arch: "x86_64" }
- { runs_on: macos-15-intel, arch: "x86_64" }
- { runs_on: macos-14, arch: "arm64" }
openssl: ['3.0', '1.1']

Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
cd arrow/r/libarrow/dist
shasum -a 512 arrow-*.zip > arrow-{{ '${{ needs.source.outputs.pkg_version }}' }}.zip.sha512
- name: Upload binary artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: r-lib__libarrow__bin__darwin-{{ '${{ matrix.platform.arch }}' }}-openssl-{{ '${{ matrix.openssl }}' }}
path: arrow/r/libarrow/dist/arrow-*.zip*
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
cd arrow/r/libarrow/dist
shasum -a 512 arrow-*.zip > arrow-{{ '${{ needs.source.outputs.pkg_version }}' }}.zip.sha512
- name: Upload binary artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: r-lib__libarrow__bin__linux-openssl-{{ '${{ matrix.openssl }}' }}
path: arrow/r/libarrow/dist/arrow-*.zip*
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
cd build
sha512sum arrow-*.zip > arrow-{{ '${{ needs.source.outputs.pkg_version }}' }}.zip.sha512
- name: Upload binary artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: r-lib__libarrow__bin__windows
path: build/arrow-*.zip*
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
cat(cmd, file = Sys.getenv("GITHUB_OUTPUT"), append = TRUE)

- name: Upload binary artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: r-pkg{{ '${{ steps.build.outputs.path }}' }}
path: arrow_*
Expand Down Expand Up @@ -348,7 +348,7 @@ jobs:
'
- name: Upload binary artifact
if: matrix.config.devtoolset
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: r-pkg_centos7
path: arrow_*
Expand All @@ -360,7 +360,7 @@ jobs:
runs-on: ubuntu-latest
container: "rstudio/r-base:4.2-centos7"
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: r-pkg_centos7
- name: Install DTS Package
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:
steps:
{{ macros.github_checkout_arrow()|indent }}
- name: Download Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts
- name: Install R
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ tasks:
arrow_jemalloc: "ON"
python_version: "{{ python_version }}"
macos_deployment_target: "{{ macos_version }}"
runs_on: "macos-13"
runs_on: "macos-15-intel"
vcpkg_arch: "amd64"
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
Expand Down
Loading