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
8 changes: 2 additions & 6 deletions dev/tasks/java-jars/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,12 @@ jobs:
matrix:
platform:
- { runs_on: ["macos-latest"], arch: "x86_64"}
- { runs_on: ["self-hosted", "macOS", "arm64", "devops-managed"], arch: "aarch_64" }
- { runs_on: ["macos-14"], arch: "aarch_64" }
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
steps:
{{ macros.github_checkout_arrow()|indent }}
- name: Set up Python
if: |
!contains(matrix.platform.runs_on, 'self-hosted')
uses: actions/setup-python@v4
with:
cache: 'pip'
Expand Down Expand Up @@ -134,9 +132,7 @@ jobs:
run: |
set -e
# make brew Java available to CMake
if [ "{{ arch }}" = "aarch_64" ]; then
export JAVA_HOME=$(brew --prefix openjdk@11)/libexec/openjdk.jdk/Contents/Home
fi
export JAVA_HOME=$(brew --prefix openjdk@11)/libexec/openjdk.jdk/Contents/Home
arrow/ci/scripts/java_jni_macos_build.sh \
$GITHUB_WORKSPACE/arrow \
$GITHUB_WORKSPACE/arrow/cpp-build \
Expand Down
128 changes: 0 additions & 128 deletions dev/tasks/python-wheels/github.osx.arm64.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,63 +19,58 @@
{{ macros.github_header() }}

env:
ARROW_JEMALLOC: "{{ arrow_jemalloc }}"
CC: "clang"
CMAKE_BUILD_TYPE: release
CXX: "clang++"
MACOSX_DEPLOYMENT_TARGET: "{{ macos_deployment_target }}"
PYARROW_BUILD_VERBOSE: 1
PYARROW_VERSION: "{{ arrow.no_rc_version }}"
PYTHON_VERSION: "{{ python_version }}"
PYTHON: "/Library/Frameworks/Python.framework/Versions/{{ python_version }}/bin/python{{ python_version }}"
VCPKG_DEFAULT_TRIPLET: amd64-osx-static-release
VCPKG_DEFAULT_TRIPLET: "{{ vcpkg_arch }}-osx-static-release"
VCPKG_FEATURE_FLAGS: "manifests"
VCPKG_OVERLAY_TRIPLETS: {{ "${{ github.workspace }}/arrow/ci/vcpkg" }}
VCPKG_ROOT: {{ "${{ github.workspace }}/vcpkg" }}

jobs:
build:
name: Build wheel for Python {{ python_version }} on macOS
runs-on: macos-latest
runs-on: "{{ runs_on }}"
env:
VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
steps:
{{ macros.github_checkout_arrow()|indent }}

- name: Install System Dependencies
run: brew install bash bison coreutils ninja

- name: Install Specific CMake version
uses: lukka/get-cmake@v3.21.2
run: |
brew install bash bison coreutils ninja
echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH

- name: Retrieve VCPKG version from arrow/.env
shell: bash
run: |
vcpkg_version=$(cat "arrow/.env" | grep "VCPKG" | cut -d "=" -f2 | tr -d '"')
echo "VCPKG_VERSION=$vcpkg_version" >> $GITHUB_ENV

- name: Install Vcpkg
shell: bash
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
run: arrow/ci/scripts/install_vcpkg.sh $VCPKG_ROOT $VCPKG_VERSION

- name: Add Vcpkg to PATH
shell: bash
run: echo ${VCPKG_ROOT} >> $GITHUB_PATH

- name: Setup NuGet Credentials
shell: bash
env:
GITHUB_TOKEN: {{ '${{ secrets.GITHUB_TOKEN }}' }}
run: |
mono `vcpkg fetch nuget | tail -n 1` \
mono $(vcpkg fetch nuget | tail -n 1) \
sources add \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
-storepasswordincleartext \
-name "GitHub" \
-username "$GITHUB_REPOSITORY_OWNER" \
-password "$GITHUB_TOKEN" \

mono `vcpkg fetch nuget | tail -n 1` \
mono $(vcpkg fetch nuget | tail -n 1) \
setapikey "$GITHUB_TOKEN" \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"

Expand All @@ -93,33 +88,30 @@ jobs:
--x-feature=s3

- name: Install Python {{ python_version }}
shell: bash
run: sudo arrow/ci/scripts/install_python.sh macos {{ python_version }}

- name: Build Wheel
shell: bash
run: |
$PYTHON -m venv build-env
source build-env/bin/activate
pip install --upgrade pip wheel
PYTHON=python arrow/ci/scripts/python_wheel_macos_build.sh x86_64 $(pwd)/arrow $(pwd)/build
PYTHON=python arrow/ci/scripts/python_wheel_macos_build.sh {{ arch }} $(pwd)/arrow $(pwd)/build

- uses: actions/upload-artifact@v3
with:
name: wheel
path: arrow/python/repaired_wheels/*.whl

- name: Test Wheel on AMD64
shell: bash
- name: Test Wheel
env:
PYTEST_ADDOPTS: "-k 'not test_cancellation'"
run: |
$PYTHON -m venv test-amd64-env
source test-amd64-env/bin/activate
$PYTHON -m venv test-env
source test-env/bin/activate
pip install --upgrade pip wheel
arch -x86_64 pip install -r arrow/python/requirements-wheel-test.txt
PYTHON=python arch -x86_64 arrow/ci/scripts/install_gcs_testbench.sh default
arch -x86_64 arrow/ci/scripts/python_wheel_unix_test.sh $(pwd)/arrow
arch -{{ arch }} pip install -r arrow/python/requirements-wheel-test.txt
PYTHON=python arch -{{ arch }} arrow/ci/scripts/install_gcs_testbench.sh default
arch -{{ arch }} arrow/ci/scripts/python_wheel_unix_test.sh $(pwd)/arrow

{{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
{{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}
32 changes: 5 additions & 27 deletions dev/tasks/r/github.packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,14 @@ jobs:
fail-fast: false
matrix:
platform:
- { runs_on: ["self-hosted", "macos-10.13"], arch: "x86_64" }

- { runs_on: ["self-hosted", "macOS", "arm64", "devops-managed"], arch: "arm64" }
- { runs_on: macos-13, arch: "x86_64" }
- { runs_on: macos-14, arch: "arm64" }
openssl: ['3.0', '1.1']

steps:
{{ macros.github_checkout_arrow(action_v="3")|indent }}
{{ macros.github_change_r_pkg_version(is_fork, '${{ needs.source.outputs.pkg_version }}')|indent }}
- name: Install Deps
if: {{ "${{ !contains(matrix.platform.runs_on, 'macos-10.13') }}" }}
run: |
brew install sccache ninja
brew install openssl@{{ '${{ matrix.openssl }}' }}
Expand Down Expand Up @@ -204,50 +202,30 @@ jobs:

r-packages:
needs: [source, windows-cpp, macos-cpp]
name: {{ '${{ matrix.platform.name }} ${{ matrix.r_version.r }}' }}
name: {{ '${{ matrix.platform.name }} ${{ matrix.r_version }}' }}
runs-on: {{ '${{ matrix.platform.runs_on }}' }}
strategy:
fail-fast: false
matrix:
platform:
- { runs_on: 'windows-latest', name: "Windows"}
- { runs_on: macos-11 , name: "macOS Big Sur"}
- { runs_on: ["self-hosted", "macOS", "arm64", "devops-managed"], name: "macOS Big Sur (M1)" }
- { runs_on: macos-11, name: "macOS x86_64"}
- { runs_on: macos-14, name: "macOS arm64" }
r_version: [oldrel, release]
steps:
- uses: r-lib/actions/setup-r@v2
# expression marker prevents the ! being parsed as yaml tag
if: {{ "${{ !contains(matrix.platform.runs_on, 'self-hosted') }}" }}
with:
r-version: {{ '${{ matrix.r_version }}' }}
- name: Setup R Self-Hosted
if: contains(matrix.platform.runs_on, 'self-hosted')
run: |
# rig is a system utility that allows for switching
# between pre-installed R version on the self-hosted runners
# rig add {{ '${{ matrix.r_version }}' }} #uncomment this to install latest release/oldrel
rig default {{ '${{ matrix.r_version }}' }}

rig system setup-user-lib
{{ macros.github_setup_local_r_repo(false, true, true)|indent }}
- name: Prepare Dependency Installation
shell: bash
run: |
tar -xzf repo/src/contrib/arrow_*.tar.gz arrow/DESCRIPTION
- name: Install dependencies
if: {{ "${{ !contains(matrix.platform.runs_on, 'self-hosted') }}" }}
uses: r-lib/actions/setup-r-dependencies@v2
with:
working-directory: 'arrow'
extra-packages: cpp11
- name: Install dependencies self-hosted
if: {{ "${{ contains(matrix.platform.runs_on, 'self-hosted') }}" }}
shell: Rscript {0}
run: |
if (!requireNamespace("devtools", quietly = TRUE)) {
install.packages("devtools")
}
devtools::install_dev_deps('./arrow')
- name: Set CRAN like openssl
if: contains(matrix.platform.runs_on, 'arm64')
run: |
Expand Down
Loading