This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 80622fa077 GH-44206: [CI][macOS] Drop support for macOS 12 (#44212)
80622fa077 is described below
commit 80622fa077e5232037cde10e222fca4004ad9d0c
Author: Sutou Kouhei <[email protected]>
AuthorDate: Thu Sep 26 17:29:38 2024 +0900
GH-44206: [CI][macOS] Drop support for macOS 12 (#44212)
### Rationale for this change
Homebrew dropped support for macOS 12 (Monterey):
https://github.com/Homebrew/brew/pull/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]>
---
.github/workflows/cpp.yml | 2 +-
.github/workflows/csharp.yml | 2 +-
.github/workflows/java.yml | 4 ++--
.github/workflows/js.yml | 4 ++--
.github/workflows/matlab.yml | 8 ++++----
.github/workflows/python.yml | 2 +-
.github/workflows/ruby.yml | 2 +-
dev/tasks/r/github.packages.yml | 4 ++--
dev/tasks/tasks.yml | 10 +++++-----
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index f5c8b6a720..762032f8e4 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -199,7 +199,7 @@ jobs:
matrix:
include:
- architecture: AMD64
- macos-version: "12"
+ macos-version: "13"
- architecture: ARM64
macos-version: "14"
env:
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
index c618350aff..5f657e6c1b 100644
--- a/.github/workflows/csharp.yml
+++ b/.github/workflows/csharp.yml
@@ -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:
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index ad39dbc7d0..5766c63bf5 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -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:
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index c7693c0513..031310fd40 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -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:
diff --git a/.github/workflows/matlab.yml b/.github/workflows/matlab.yml
index ca8280927f..7d217b07ad 100644
--- a/.github/workflows/matlab.yml
+++ b/.github/workflows/matlab.yml
@@ -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
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 4916287556..5b7058fbb4 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -143,7 +143,7 @@ jobs:
matrix:
include:
- architecture: AMD64
- macos-version: "12"
+ macos-version: "13"
- architecture: ARM64
macos-version: "14"
env:
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 83a066dc27..13da7e62ee 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -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
diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml
index 11d1f85a4c..839e3d5341 100644
--- a/dev/tasks/r/github.packages.yml
+++ b/dev/tasks/r/github.packages.yml
@@ -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:
@@ -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
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 10b5426b75..1747ff546a 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -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:
@@ -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
@@ -964,7 +964,7 @@ tasks:
params:
target: {{ target }}
use_conda: True
- github_runner: "macos-12"
+ github_runner: "macos-13"
{% endfor %}
{% for target in ["cpp",
@@ -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",
@@ -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
