Skip to content

Commit

Permalink
GH-44206: [CI][macOS] Drop support for macOS 12 (#44212)
Browse files Browse the repository at this point in the history
### Rationale for this change

Homebrew dropped support for macOS 12 (Monterey): Homebrew/brew#18314

### What changes are included in this PR?

Use macOS 13 instead of macOS 12 as much as possible.

### Are these changes tested?

Yes.

### Are there any user-facing changes?

No.
* GitHub Issue: #44206

Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Antoine Pitrou <[email protected]>
  • Loading branch information
kou authored Sep 26, 2024
1 parent bc923bd commit 80622fa
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ jobs:
matrix:
include:
- architecture: AMD64
macos-version: "12"
macos-version: "13"
- architecture: ARM64
macos-version: "14"
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:

macos:
name: AMD64 macOS 13 C# ${{ matrix.dotnet }}
runs-on: macos-13 # Pending https://github.com/pythonnet/pythonnet/issues/2396
runs-on: macos-13
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: AMD64 macOS 13 Java JDK ${{ matrix.jdk }}
runs-on: macos-13
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: AMD64 macOS 13 NodeJS ${{ matrix.node }}
runs-on: macos-13
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 30
strategy:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/matlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ jobs:
strategy:
matrix:
include:
- architecture: AMD64
macos-version: "12"
- architecture: ARM64
macos-version: "14"
- architecture: AMD64
macos-version: "13"
- architecture: ARM64
macos-version: "14"
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
matrix:
include:
- architecture: AMD64
macos-version: "12"
macos-version: "13"
- architecture: ARM64
macos-version: "14"
env:
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
10 changes: 5 additions & 5 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ tasks:

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

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

wheel-macos-{{ macos_codename }}-{{ python_tag }}-{{ abi_tag }}-amd64:
Expand All @@ -428,7 +428,7 @@ tasks:
python_version: "{{ python_version }}"
python_abi_tag: "{{ abi_tag }}"
macos_deployment_target: "{{ macos_version }}"
runs_on: "macos-12"
runs_on: "macos-13"
vcpkg_arch: "amd64"
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
Expand Down Expand Up @@ -964,7 +964,7 @@ tasks:
params:
target: {{ target }}
use_conda: True
github_runner: "macos-12"
github_runner: "macos-13"
{% endfor %}

{% for target in ["cpp",
Expand All @@ -979,7 +979,7 @@ tasks:
template: verify-rc/github.macos.yml
params:
target: {{ target }}
github_runner: "macos-12"
github_runner: "macos-13"
{% endfor %}

{% for target in ["cpp",
Expand All @@ -1001,7 +1001,7 @@ tasks:
github_runner: "macos-14"
{% endfor %}

{% for macos_version in ["12"] %}
{% for macos_version in ["13"] %}
verify-rc-binaries-wheels-macos-{{ macos_version }}-amd64:
ci: github
template: verify-rc/github.macos.yml
Expand Down

0 comments on commit 80622fa

Please sign in to comment.