From 0fd2ed8e60c826546bf36f6cd4f940fc2a903722 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 25 Sep 2024 13:43:03 +0900 Subject: [PATCH] Use macos-13 instead of removing macos-12 jobs --- .github/workflows/cpp.yml | 9 ++++++--- .github/workflows/csharp.yml | 4 ++-- .github/workflows/java.yml | 4 ++-- .github/workflows/js.yml | 4 ++-- .github/workflows/matlab.yml | 9 ++++++--- .github/workflows/python.yml | 9 ++++++--- dev/tasks/tasks.yml | 38 ++++++++++++++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 15 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 120eec6679acf..762032f8e4ea3 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -190,15 +190,18 @@ jobs: docker compose run --rm minimal macos: - name: ARM64 macOS ${{ matrix.macos-version }} C++ + name: ${{ matrix.architecture }} 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: - macos-version: - - "14" + include: + - architecture: AMD64 + macos-version: "13" + - architecture: ARM64 + macos-version: "14" env: ARROW_AZURE: ON ARROW_BUILD_TESTS: ON diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index 76d9561011706..5f657e6c1bf58 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -94,8 +94,8 @@ jobs: run: ci/scripts/csharp_test.sh $(pwd) macos: - name: ARM64 macOS 14 C# ${{ matrix.dotnet }} - runs-on: macos-14 + name: AMD64 macOS 13 C# ${{ matrix.dotnet }} + 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 30311036269ff..5766c63bf5221 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -106,8 +106,8 @@ jobs: run: archery docker push ${{ matrix.image }} macos: - name: ARM64 macOS 14 Java JDK ${{ matrix.jdk }} - runs-on: macos-14 + 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 5227260ed6df1..031310fd4027b 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -81,8 +81,8 @@ jobs: run: archery docker push debian-js macos: - name: ARM64 macOS 14 NodeJS ${{ matrix.node }} - runs-on: macos-14 + 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 1b4c3dcdec33e..7d217b07ad7d7 100644 --- a/.github/workflows/matlab.yml +++ b/.github/workflows/matlab.yml @@ -98,13 +98,16 @@ jobs: select-by-folder: matlab/test strict: true macos: - name: ARM64 macOS ${{ matrix.macos-version }} MATLAB + name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} MATLAB runs-on: macos-${{ matrix.macos-version }} if: ${{ !contains(github.event.pull_request.title, 'WIP') }} strategy: matrix: - macos-version: - - "14" + include: + - 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 442f181b2c4a0..5b7058fbb441b 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -134,15 +134,18 @@ jobs: run: archery docker push ${{ matrix.image }} macos: - name: ARM64 macOS ${{ matrix.macos-version }} Python 3 + name: ${{ matrix.architecture }} 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: - macos-version: - - "14" + include: + - architecture: AMD64 + macos-version: "13" + - architecture: ARM64 + macos-version: "14" env: ARROW_HOME: /tmp/local ARROW_AZURE: ON diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index d95878cdb85ef..cc6b5142aadf9 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -416,6 +416,25 @@ tasks: {############################## Wheel macOS ####################################} +{% 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: + 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-13" + 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 @@ -938,6 +957,16 @@ 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-13" + {% endfor %} + {% for target in ["cpp", "csharp", "integration", @@ -957,6 +986,15 @@ tasks: github_runner: "macos-14" {% endfor %} + {% for macos_version in ["13"] %} + 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