From e36843057d8a99fbd6c8e6f2edee5235936d26f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 1 Jul 2022 17:27:07 +0200
Subject: [PATCH] package/ci: Xcode 11.7 is the oldest supported on CircleCI.

It's getting deprecated faster than I can update, heh.
---
 package/ci/circleci.yml          | 25 ++++++++-----------------
 package/ci/ios-simulator-gles.sh |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index 7d55a62c7..bed75dea3 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -7,17 +7,10 @@ executors:
   ubuntu-18_04:
     docker:
     - image: ubuntu:bionic-20220427
-  xcode-11_5:
-    # Molten-vk isn't in (non-updated) Homebrew on the 9.4 or 10.0/1/2 image,
-    # have to use 10.3 instead; since 2021-06-08 it refuses to work on 10.14 so
-    # have to use 11.2 at least; since 2022-01-20 the oldest 11 image is 11.4.
-    # Since 2922-05-23, 11.4.1 images wait endlessly for "VM assignment", using
-    # 11.5 instead.
+  # Anything below 11.7 is deprecated as of June 6th 2022
+  xcode-11_7:
     macos:
-      xcode: 11.5
-  xcode-11_6:
-    macos:
-      xcode: 11.6.0
+      xcode: 11.7.0
   emscripten1:
     docker:
     # 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar
@@ -467,7 +460,7 @@ jobs:
         script: unix-desktop.sh
 
   macos-gl:
-    executor: xcode-11_5
+    executor: xcode-11_7
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -480,7 +473,7 @@ jobs:
     - lcov
 
   macos-gles3:
-    executor: xcode-11_5
+    executor: xcode-11_7
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -497,9 +490,7 @@ jobs:
     - lcov
 
   macos-vulkan:
-    # SwiftShader is built on 10.15 and can't be used on older versions due to
-    # dyld: lazy symbol binding failed: Symbol not found: ____chkstk_darwin
-    executor: xcode-11_6
+    executor: xcode-11_7
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -515,7 +506,7 @@ jobs:
     - lcov
 
   macos-static:
-    executor: xcode-11_5
+    executor: xcode-11_7
     environment:
       # STUPID yml interprets unquoted ON as a boolean
       BUILD_STATIC: "ON"
@@ -594,7 +585,7 @@ jobs:
         script: android-x86-vulkan.sh
 
   ios-gles3:
-    executor: xcode-11_5
+    executor: xcode-11_7
     environment:
       # STUPID yml interprets unquoted ON as a boolean
       TARGET_GLES2: "OFF"
diff --git a/package/ci/ios-simulator-gles.sh b/package/ci/ios-simulator-gles.sh
index 3479fb7e7..c12e411cf 100755
--- a/package/ci/ios-simulator-gles.sh
+++ b/package/ci/ios-simulator-gles.sh
@@ -41,7 +41,7 @@ cd ../..
 curl --insecure -O https://www.libsdl.org/release/SDL2-2.0.10.tar.gz
 tar -xzvf SDL2-2.0.10.tar.gz
 cd SDL2-2.0.10/Xcode-iOS/SDL
-set -o pipefail && xcodebuild -sdk iphonesimulator13.5 | xcbeautify
+set -o pipefail && xcodebuild -sdk iphonesimulator13.7 | xcbeautify
 cp build/Release-iphonesimulator/libSDL2.a $HOME/deps/lib
 mkdir -p $HOME/deps/include/SDL2
 cp -R ../../include/* $HOME/deps/include/SDL2