From 3585adfe338a3a16dff3aaaeb86035b699dad0e0 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 4 Nov 2024 16:03:27 +0100
Subject: [PATCH] workflow: Updates for runner deprecations

---
 .github/workflows/ci.yml | 42 ++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 604b671120..50d119698a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ jobs:
         profile:
         - ubuntu-bionic-standard-unity-makefile
         - ubuntu-bionic-coverage-ninja
-        - macos-eigen-coverage-unity-xcode
-        - macos-nometa-standard-makefile
+        #- macos-coverage-unity-xcode
+        - macos-eigen-nometa-standard-makefile
         - windows-standard-unity-msvc
         - windows-nopython-nometa-standard-msvc
 
@@ -39,25 +39,25 @@ jobs:
           python: YES
           eigen: NO
 
-        - profile: macos-eigen-coverage-unity-xcode
-          os: macOS-12
-          config: Coverage
-          unity: YES
-          generator: Xcode
-          compiler: Default
-          metalibs: YES
-          python: YES
-          eigen: YES
+        #- profile: macos-coverage-unity-xcode
+        #  os: macOS-13
+        #  config: Coverage
+        #  unity: YES
+        #  generator: Xcode
+        #  compiler: Default
+        #  metalibs: YES
+        #  python: YES
+        #  eigen: NO
 
-        - profile: macos-nometa-standard-makefile
-          os: macOS-12
+        - profile: macos-eigen-nometa-standard-makefile
+          os: macOS-13
           config: Standard
           unity: NO
           generator: Unix Makefiles
           compiler: Default
           metalibs: NO
           python: YES
-          eigen: NO
+          eigen: YES
 
         - profile: windows-standard-unity-msvc
           os: windows-2022
@@ -102,6 +102,10 @@ jobs:
 
         brew install ccache
 
+    - name: Set up XCode (macOS)
+      if: runner.os == 'macOS'
+      run: sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
+
     - name: Install dependencies (Ubuntu)
       if: startsWith(matrix.os, 'ubuntu')
       run: >
@@ -117,7 +121,7 @@ jobs:
 
     - name: Cache dependencies (Windows)
       if: runner.os == 'Windows'
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: thirdparty
         key: ci-cmake-${{ runner.OS }}-thirdparty-v1.10.14-r1
@@ -134,7 +138,7 @@ jobs:
 
     - name: ccache (non-Windows)
       if: runner.os != 'Windows'
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ccache
         key: ci-cmake-ccache-${{ matrix.profile }}
@@ -361,7 +365,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macOS-12]
+        os: [ubuntu-20.04, windows-2019, macOS-13]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -387,6 +391,10 @@ jobs:
         rmdir panda3d-1.10.14
         (cd thirdparty/darwin-libs-a && rm -rf rocket)
 
+    - name: Set up XCode (macOS)
+      if: runner.os == 'macOS'
+      run: sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
+
     - name: Set up Python 3.13
       if: runner.os != 'Windows'
       uses: actions/setup-python@v5