Switch macOS 12 runner images to macOS 13

QuLogic · QuLogic · commit fb38983f1df4 · 2024-10-16T16:58:53.000-04:00
These are going away soon, so let's see how this works out. actions/runner-images#10721
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -124,7 +124,7 @@ jobs:
             cibw_archs: "aarch64"
           - os: windows-latest
             cibw_archs: "auto64"
-          - os: macos-12
+          - os: macos-13
             cibw_archs: "x86_64"
           - os: macos-14
             cibw_archs: "arm64"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -97,7 +97,7 @@ jobs:
             pyqt6-ver: '!=6.6.0'
             # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
             pyside6-ver: '!=6.5.1'
-          - os: macos-12  # This runner is on Intel chips.
+          - os: macos-13  # This runner is on Intel chips.
             python-version: '3.10'
             # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
             pyside6-ver: '!=6.5.1'
@@ -189,12 +189,7 @@ jobs:
           macOS)
             brew update
             export HOMEBREW_NO_INSTALL_UPGRADE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-            brew install ccache ghostscript ninja
-            # The macOS 12 images have an older Python, and this causes homebrew to generate conflicts.
-            # We'll just skip GTK for now, to not pull in Python updates.
-            if [[ "${{ matrix.os }}" = macos-14 ]]; then
-              brew install gobject-introspection gtk4
-            fi
+            brew install ccache ghostscript gobject-introspection gtk4 ninja
             brew install --cask font-noto-sans-cjk inkscape
             ;;
           esac
