Change to use macos-14

sorairolake · Apr 20, 2024 · b461b9d · b461b9d
1 parent 681ffee
commit b461b9d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml
@@ -42,9 +42,9 @@ jobs:
             os: ubuntu-22.04
             use-cross: true
           - target: aarch64-apple-darwin
-            os: macos-12
+            os: macos-14
           - target: x86_64-apple-darwin
-            os: macos-12
+            os: macos-14
           - target: aarch64-pc-windows-msvc
             os: windows-2022
           - target: x86_64-pc-windows-msvc

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -21,16 +21,16 @@ jobs:
       matrix:
         target:
           - x86_64-unknown-linux-gnu
-          - x86_64-apple-darwin
+          - aarch64-apple-darwin
           - x86_64-pc-windows-msvc
         toolchain:
           - 1.74.0 # MSRV
           - stable
         include:
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-22.04
-          - target: x86_64-apple-darwin
-            os: macos-12
+          - target: aarch64-apple-darwin
+            os: macos-14
           - target: x86_64-pc-windows-msvc
             os: windows-2022
     steps:
@@ -98,14 +98,32 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
-          - macos-12
+          - macos-14
           - windows-2022
         rust-version:
           - 1.74.0 # MSRV
           - stable
         python-version:
-          - "3.8"
           - "3.12" # latest version
+        include:
+          - os: ubuntu-22.04
+            rust-version: 1.74.0 # MSRV
+            python-version: "3.8"
+          - os: ubuntu-22.04
+            rust-version: stable
+            python-version: "3.8"
+          - os: macos-14
+            rust-version: 1.74.0 # MSRV
+            python-version: "3.10"
+          - os: macos-14
+            rust-version: stable
+            python-version: "3.10"
+          - os: windows-2022
+            rust-version: 1.74.0 # MSRV
+            python-version: "3.8"
+          - os: windows-2022
+            rust-version: stable
+            python-version: "3.8"
     steps:
       - name: Set Git to use LF
         if: matrix.os == 'windows-2022'

diff --git a/.github/workflows/release_python.yaml b/.github/workflows/release_python.yaml
@@ -63,20 +63,16 @@ jobs:
 
   macos:
     name: Build wheels for macOS
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         target:
           - aarch64
           - x86_64
         python-version:
-          - "3.8"
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12" # latest version
-          - "pypy3.8"
-          - "pypy3.9"
           - "pypy3.10" # latest version
     steps:
       - name: Checkout code