From 188a4257d8e82485d76f524f4d8b4959c56d0238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 3 Jul 2024 16:24:03 +0200
Subject: [PATCH] package/ci: can't build on x86 Mac anymore.

Which means it also has to fetch an ARM build of SwiftShader and Vulkan
loader.
---
 package/ci/circleci.yml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index f14b8e4f6..c0c627bb9 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -15,10 +15,12 @@ executors:
   ubuntu-18_04:
     docker:
     - image: ubuntu:bionic-20220427
-  # Anything below 12.5.1 is deprecated as of August 2023
-  xcode-12_5:
+  # Anything below 13.4.1 (and all x86 variants) are deprecated as of June 28th
+  # 2024
+  xcode-13_4:
     macos:
-      xcode: 12.5.1
+      xcode: 13.4.1
+    resource_class: macos.m1.medium.gen1
   emscripten1:
     docker:
     # 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar
@@ -208,8 +210,8 @@ commands:
         # you could just download the artifacts directly, right? RIGHT?
         command: |
           mkdir -p $HOME/swiftshader && cd $HOME/swiftshader
-          wget https://ci.magnum.graphics/swiftshader-gles-r5464.a6940c8e6e-<< parameters.build >>.zip
-          unzip swiftshader-gles-r5464.a6940c8e6e-<< parameters.build >>.zip
+          wget https://ci.magnum.graphics/swiftshader-gles-r5904.14dcbed947-<< parameters.build >>.zip
+          unzip swiftshader-gles-r5904.14dcbed947-<< parameters.build >>.zip
 
   install-swiftshader-vulkan:
     parameters:
@@ -223,8 +225,8 @@ commands:
         # you could just download the artifacts directly, right? RIGHT?
         command: |
           mkdir -p $HOME/swiftshader && cd $HOME/swiftshader
-          wget https://ci.magnum.graphics/swiftshader-vulkan-r5464.a6940c8e6e-<< parameters.build >>.zip
-          unzip swiftshader-vulkan-r5464.a6940c8e6e-<< parameters.build >>.zip
+          wget https://ci.magnum.graphics/swiftshader-vulkan-r5904.14dcbed947-<< parameters.build >>.zip
+          unzip swiftshader-vulkan-r5904.14dcbed947-<< parameters.build >>.zip
 
   install-vulkan-loader:
     parameters:
@@ -398,7 +400,7 @@ jobs:
     - install-cmake:
         version: "3.5.2"
     - install-swiftshader-gles:
-        build: ubuntu-16.04
+        build: ubuntu-18.04
     - build:
         script: unix-desktop-gles.sh
     - lcov
@@ -430,7 +432,7 @@ jobs:
     - install-cmake:
         version: "3.5.2"
     - install-swiftshader-gles:
-        build: ubuntu-16.04
+        build: ubuntu-18.04
     - build:
         script: unix-desktop-gles.sh
     - lcov
@@ -559,7 +561,7 @@ jobs:
         script: unix-desktop.sh
 
   macos-gl:
-    executor: xcode-12_5
+    executor: xcode-13_4
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -574,7 +576,7 @@ jobs:
     - lcov
 
   macos-gles3:
-    executor: xcode-12_5
+    executor: xcode-13_4
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -587,13 +589,13 @@ jobs:
     - install-base-macos:
         extra: sdl2 glfw wget
     - install-swiftshader-gles:
-        build: macos-10.15
+        build: macos12-arm64
     - build:
         script: unix-desktop-gles.sh
     - lcov
 
   macos-vulkan:
-    executor: xcode-12_5
+    executor: xcode-13_4
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -601,15 +603,15 @@ jobs:
     - install-base-macos:
         extra: sdl2 glfw wget
     - install-swiftshader-vulkan:
-        build: macos-10.15
+        build: macos12-arm64
     - install-vulkan-loader:
-        build: macos-10.15
+        build: macos12-x64-arm64
     - build:
         script: unix-desktop-vulkan.sh
     - lcov
 
   macos-static:
-    executor: xcode-12_5
+    executor: xcode-13_4
     environment:
       # STUPID yml interprets unquoted ON as a boolean
       BUILD_STATIC: "ON"
@@ -699,7 +701,7 @@ jobs:
         script: android-x86-vulkan.sh
 
   ios-gles3:
-    executor: xcode-12_5
+    executor: xcode-13_4
     environment:
       # STUPID yml interprets unquoted ON as a boolean
       TARGET_GLES2: "OFF"