Skip to content

Commit

Permalink
apacheGH-44206: [CI][macOS] Drop support for macOS 12
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Sep 24, 2024
1 parent 508eb2f commit 51e8fae
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 80 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,15 @@ jobs:
docker compose run --rm minimal
macos:
name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} C++
name: ARM64 macOS ${{ matrix.macos-version }} C++
runs-on: macos-${{ matrix.macos-version }}
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 75
strategy:
fail-fast: false
matrix:
include:
- architecture: AMD64
macos-version: "12"
- architecture: ARM64
macos-version: "14"
macos-version:
- "14"
env:
ARROW_AZURE: ON
ARROW_BUILD_TESTS: ON
Expand Down
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: ARM64 macOS 14 C# ${{ matrix.dotnet }}
runs-on: macos-14
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 15
strategy:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ jobs:
run: archery docker push ${{ matrix.image }}

macos:
name: AMD64 macOS 12 Java JDK ${{ matrix.jdk }}
runs-on: macos-12
name: ARM64 macOS 14 Java JDK ${{ matrix.jdk }}
runs-on: macos-14
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 30
strategy:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ jobs:
run: archery docker push debian-js

macos:
name: AMD64 macOS 12 NodeJS ${{ matrix.node }}
runs-on: macos-12
name: ARM64 macOS 14 NodeJS ${{ matrix.node }}
runs-on: macos-14
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 30
strategy:
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/matlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,13 @@ jobs:
select-by-folder: matlab/test
strict: true
macos:
name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} MATLAB
name: ARM64 macOS ${{ matrix.macos-version }} MATLAB
runs-on: macos-${{ matrix.macos-version }}
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
strategy:
matrix:
include:
- architecture: AMD64
macos-version: "12"
- architecture: ARM64
macos-version: "14"
macos-version:
- "14"
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,15 @@ jobs:
run: archery docker push ${{ matrix.image }}

macos:
name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} Python 3
name: ARM64 macOS ${{ matrix.macos-version }} Python 3
runs-on: macos-${{ matrix.macos-version }}
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- architecture: AMD64
macos-version: "12"
- architecture: ARM64
macos-version: "14"
macos-version:
- "14"
env:
ARROW_HOME: /tmp/local
ARROW_AZURE: ON
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
run: archery docker push ubuntu-ruby

macos:
name: AMD64 macOS 14 GLib & Ruby
name: ARM64 macOS 14 GLib & Ruby
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
Expand Down
4 changes: 2 additions & 2 deletions dev/tasks/r/github.packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ jobs:
matrix:
platform:
- { runs_on: 'windows-latest', name: "Windows"}
- { runs_on: macos-12, name: "macOS x86_64"}
- { runs_on: macos-13, name: "macOS x86_64"}
- { runs_on: macos-14, name: "macOS arm64" }
r_version: [oldrel, release]
steps:
Expand Down Expand Up @@ -389,7 +389,7 @@ jobs:
matrix:
platform:
- {runs_on: "ubuntu-latest", name: "Linux"}
- {runs_on: "macos-12" , name: "macOS"}
- {runs_on: "macos-13" , name: "macOS"}
steps:
- name: Install R
uses: r-lib/actions/setup-r@v2
Expand Down
53 changes: 0 additions & 53 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -416,25 +416,6 @@ tasks:

{############################## Wheel macOS ####################################}

{% for macos_version, macos_codename in [("12.0", "monterey")] %}
{% set platform_tag = "macosx_{}_x86_64".format(macos_version.replace('.', '_')) %}

wheel-macos-{{ macos_codename }}-{{ python_tag }}-{{ abi_tag }}-amd64:
ci: github
template: python-wheels/github.osx.yml
params:
arch: "x86_64"
arrow_jemalloc: "ON"
python_version: "{{ python_version }}"
python_abi_tag: "{{ abi_tag }}"
macos_deployment_target: "{{ macos_version }}"
runs_on: "macos-12"
vcpkg_arch: "amd64"
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl

{% endfor %}

wheel-macos-monterey-{{ python_tag }}-{{ abi_tag }}-arm64:
ci: github
template: python-wheels/github.osx.yml
Expand Down Expand Up @@ -957,31 +938,6 @@ tasks:

######################## macOS verification ################################

{% for target in ["cpp", "integration", "python"] %}
verify-rc-source-{{ target }}-macos-conda-amd64:
ci: github
template: verify-rc/github.macos.yml
params:
target: {{ target }}
use_conda: True
github_runner: "macos-12"
{% endfor %}

{% for target in ["cpp",
"csharp",
"integration",
"java",
"js",
"python",
"ruby"] %}
verify-rc-source-{{ target }}-macos-amd64:
ci: github
template: verify-rc/github.macos.yml
params:
target: {{ target }}
github_runner: "macos-12"
{% endfor %}

{% for target in ["cpp",
"csharp",
"integration",
Expand All @@ -1001,15 +957,6 @@ tasks:
github_runner: "macos-14"
{% endfor %}

{% for macos_version in ["12"] %}
verify-rc-binaries-wheels-macos-{{ macos_version }}-amd64:
ci: github
template: verify-rc/github.macos.yml
params:
github_runner: "macos-{{ macos_version }}"
target: "wheels"
{% endfor %}

{% for macos_version in ["14"] %}
verify-rc-binaries-wheels-macos-{{ macos_version }}-arm64:
ci: github
Expand Down

0 comments on commit 51e8fae

Please sign in to comment.