package/ci: can't test on Xcode 11 anymore.

Also disable iOS tests until mosra/corrade#176 is resolved.
mosra · Aug 18, 2023 · 6cb0b22 · 6cb0b22
1 parent 258f700
commit 6cb0b22
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
@@ -15,10 +15,10 @@ executors:
   ubuntu-18_04:
     docker:
     - image: ubuntu:bionic-20220427
-  # Anything below 11.7 is deprecated as of June 6th 2022
-  xcode-11_7:
+  # Anything below 12.5.1 is deprecated as of August 2023
+  xcode-12_5:
     macos:
-      xcode: 11.7.0
+      xcode: 12.5.1
   emscripten1:
     docker:
     # 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar
@@ -505,7 +505,7 @@ jobs:
         script: unix-desktop.sh
 
   macos-gl:
-    executor: xcode-11_7
+    executor: xcode-12_5
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -518,7 +518,7 @@ jobs:
     - lcov
 
   macos-gles3:
-    executor: xcode-11_7
+    executor: xcode-12_5
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -535,7 +535,7 @@ jobs:
     - lcov
 
   macos-vulkan:
-    executor: xcode-11_7
+    executor: xcode-12_5
     environment:
       CMAKE_CXX_FLAGS: --coverage
       CONFIGURATION: Debug
@@ -551,7 +551,7 @@ jobs:
     - lcov
 
   macos-static:
-    executor: xcode-11_7
+    executor: xcode-12_5
     environment:
       # STUPID yml interprets unquoted ON as a boolean
       BUILD_STATIC: "ON"
@@ -633,7 +633,7 @@ jobs:
         script: android-x86-vulkan.sh
 
   ios-gles3:
-    executor: xcode-11_7
+    executor: xcode-12_5
     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
@@ -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.7 -jobs $XCODE_JOBS -parallelizeTargets | xcbeautify
+set -o pipefail && xcodebuild -sdk iphonesimulator -jobs $XCODE_JOBS -parallelizeTargets | xcbeautify
 cp build/Release-iphonesimulator/libSDL2.a $HOME/deps/lib
 mkdir -p $HOME/deps/include/SDL2
 cp -R ../../include/* $HOME/deps/include/SDL2
@@ -79,10 +79,12 @@ cmake .. \
     -DMAGNUM_BUILD_GL_TESTS=ON \
     -G Xcode
 set -o pipefail && cmake --build . --config Release -j$XCODE_JOBS | xcbeautify
+
+# TODO enable again once https://github.com/mosra/corrade/pull/176 is resolved
 # TODO: find a better way to avoid
 # Library not loaded: /System/Library/Frameworks/OpenGLES.framework/OpenGLES
 # error
-DYLD_FALLBACK_LIBRARY_PATH="/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 12.4.simruntime/Contents/Resources/RuntimeRoot/System/Library/Frameworks/OpenGLES.framework" DYLD_FALLBACK_FRAMEWORK_PATH="/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 12.4.simruntime/Contents/Resources/RuntimeRoot/System/Library/Frameworks" CORRADE_TEST_COLOR=ON ctest -V -C Release -E "GLTest|GLBenchmark"
+# DYLD_FALLBACK_LIBRARY_PATH="/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 12.4.simruntime/Contents/Resources/RuntimeRoot/System/Library/Frameworks/OpenGLES.framework" DYLD_FALLBACK_FRAMEWORK_PATH="/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 12.4.simruntime/Contents/Resources/RuntimeRoot/System/Library/Frameworks" CORRADE_TEST_COLOR=ON ctest -V -C Release -E "GLTest|GLBenchmark"
 
 # Test install, after running the tests as for them it shouldn't be needed
 set -o pipefail && cmake --build . --config Release --target install -j$XCODE_JOBS | xcbeautify