Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-44206: [CI][macOS] Drop support for macOS 12 #44212

Merged
merged 4 commits into from
Sep 26, 2024
Merged

GH-44206: [CI][macOS] Drop support for macOS 12 #44212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51e8fae
GH-44206: [CI][macOS] Drop support for macOS 12
kou Sep 24, 2024
0fd2ed8
Use macos-13 instead of removing macos-12 jobs
kou Sep 25, 2024
c619193
Restore verify-rc-source-*-macos-amd64
kou Sep 25, 2024
0991619
Restore java
kou Sep 25, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
Comment on lines 430 to +431
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we keep the deployment target at 12.0?
Because right now this PR is not just a "CI" PR, it affects Python packaging, making our wheels no longer install on MacOS 12

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, should we keep macOS 12 support for wheels?
Can we continue to discuss this in this thread https://lists.apache.org/thread/03dqppm1kc26nfppk8wcj0tnzh1st3mx ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created issue, PR and sent email: #44314

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
Loading