ci: macos-latest now means M1 (apache#1764)

Fixes apache#1763.
lidavidm · Apr 25, 2024 · 5773d93 · 5773d93
1 parent cd60c0e
commit 5773d93
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         version: ['7.0.x']
-        os: [ubuntu-latest, windows-2019, macos-latest]
+        os: [ubuntu-latest, windows-2019, macos-13, macos-latest]
     steps:
       - name: Install C#
         uses: actions/setup-dotnet@v4

diff --git a/.github/workflows/native-unix.yml b/.github/workflows/native-unix.yml
@@ -63,11 +63,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest"]
         include:
-          - os: macos-latest
+          - os: macos-13
             goarch: x64
-          - os: macos-14
+          - os: macos-latest
             goarch: arm64
           - os: ubuntu-latest
             goarch: x64
@@ -146,7 +146,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest"]
     env:
       # Required for macOS
       # https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
@@ -251,9 +251,9 @@ jobs:
       - drivers-build-conda
     strategy:
       matrix:
-        # N.B. no macos-14 here since conda-forge does not package
+        # N.B. no macos-latest here since conda-forge does not package
         # arrow-c-glib for M1
-        os: ["macos-latest", "ubuntu-latest"]
+        os: ["macos-13", "ubuntu-latest"]
     env:
       # Required for macOS
       # https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
@@ -316,7 +316,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest", "windows-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest", "windows-latest"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -358,11 +358,11 @@ jobs:
       - drivers-build-conda
     strategy:
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest"]
         include:
-          - os: macos-latest
+          - os: macos-13
             goarch: x64
-          - os: macos-14
+          - os: macos-latest
             goarch: arm64
           - os: ubuntu-latest
             goarch: x64
@@ -449,7 +449,7 @@ jobs:
       - drivers-build-conda
     strategy:
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest"]
         python: ["3.9", "3.11"]
     env:
       # Required for macOS

diff --git a/.github/workflows/nightly-verify.yml b/.github/workflows/nightly-verify.yml
@@ -109,7 +109,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest", "windows-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest", "windows-latest"]
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -448,7 +448,7 @@ jobs:
 
   python-conda-macos:
     name: "Python ${{ matrix.arch }} Conda"
-    runs-on: macos-latest
+    runs-on: macos-13
     # No need for Conda packages during release
     # TODO(apache/arrow-adbc#468): re-enable
     if: false
@@ -632,11 +632,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-latest", "macos-14"]
+        os: ["macos-13", "macos-latest"]
         include:
-          - os: macos-latest
+          - os: macos-13
             arch: amd64
-          - os: macos-14
+          - os: macos-latest
             arch: arm64v8
     env:
       MACOSX_DEPLOYMENT_TARGET: "10.15"

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -45,7 +45,8 @@ jobs:
   rust:
     strategy:
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-latest]
+        # TODO(lidavidm): add back macos-latest once it has Cargo installed
+        os: [windows-latest, macos-13, ubuntu-latest]
     name: "Rust ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     env:

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -48,15 +48,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest"]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
       # No Docker on M1
       - name: Skip Binary Verifiction
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'macos-latest'
         shell: bash
         run: |
           echo "TEST_APT=0" | tee -a $GITHUB_ENV
@@ -78,7 +78,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["macos-latest", "macos-14", "ubuntu-latest", "windows-latest"]
+        os: ["macos-13", "macos-latest", "ubuntu-latest", "windows-latest"]
     steps:
       - uses: actions/checkout@v4
         with: