Skip to content

Commit 6cb0b22

Browse files
committed
package/ci: can't test on Xcode 11 anymore.
Also disable iOS tests until mosra/corrade#176 is resolved.
1 parent 258f700 commit 6cb0b22

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

package/ci/circleci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ executors:
1515
ubuntu-18_04:
1616
docker:
1717
- image: ubuntu:bionic-20220427
18-
# Anything below 11.7 is deprecated as of June 6th 2022
19-
xcode-11_7:
18+
# Anything below 12.5.1 is deprecated as of August 2023
19+
xcode-12_5:
2020
macos:
21-
xcode: 11.7.0
21+
xcode: 12.5.1
2222
emscripten1:
2323
docker:
2424
# 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar
@@ -505,7 +505,7 @@ jobs:
505505
script: unix-desktop.sh
506506

507507
macos-gl:
508-
executor: xcode-11_7
508+
executor: xcode-12_5
509509
environment:
510510
CMAKE_CXX_FLAGS: --coverage
511511
CONFIGURATION: Debug
@@ -518,7 +518,7 @@ jobs:
518518
- lcov
519519

520520
macos-gles3:
521-
executor: xcode-11_7
521+
executor: xcode-12_5
522522
environment:
523523
CMAKE_CXX_FLAGS: --coverage
524524
CONFIGURATION: Debug
@@ -535,7 +535,7 @@ jobs:
535535
- lcov
536536

537537
macos-vulkan:
538-
executor: xcode-11_7
538+
executor: xcode-12_5
539539
environment:
540540
CMAKE_CXX_FLAGS: --coverage
541541
CONFIGURATION: Debug
@@ -551,7 +551,7 @@ jobs:
551551
- lcov
552552

553553
macos-static:
554-
executor: xcode-11_7
554+
executor: xcode-12_5
555555
environment:
556556
# STUPID yml interprets unquoted ON as a boolean
557557
BUILD_STATIC: "ON"
@@ -633,7 +633,7 @@ jobs:
633633
script: android-x86-vulkan.sh
634634

635635
ios-gles3:
636-
executor: xcode-11_7
636+
executor: xcode-12_5
637637
environment:
638638
# STUPID yml interprets unquoted ON as a boolean
639639
TARGET_GLES2: "OFF"

package/ci/ios-simulator-gles.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ cd ../..
4141
curl --insecure -O https://www.libsdl.org/release/SDL2-2.0.10.tar.gz
4242
tar -xzvf SDL2-2.0.10.tar.gz
4343
cd SDL2-2.0.10/Xcode-iOS/SDL
44-
set -o pipefail && xcodebuild -sdk iphonesimulator13.7 -jobs $XCODE_JOBS -parallelizeTargets | xcbeautify
44+
set -o pipefail && xcodebuild -sdk iphonesimulator -jobs $XCODE_JOBS -parallelizeTargets | xcbeautify
4545
cp build/Release-iphonesimulator/libSDL2.a $HOME/deps/lib
4646
mkdir -p $HOME/deps/include/SDL2
4747
cp -R ../../include/* $HOME/deps/include/SDL2
@@ -79,10 +79,12 @@ cmake .. \
7979
-DMAGNUM_BUILD_GL_TESTS=ON \
8080
-G Xcode
8181
set -o pipefail && cmake --build . --config Release -j$XCODE_JOBS | xcbeautify
82+
83+
# TODO enable again once https://github.com/mosra/corrade/pull/176 is resolved
8284
# TODO: find a better way to avoid
8385
# Library not loaded: /System/Library/Frameworks/OpenGLES.framework/OpenGLES
8486
# error
85-
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"
87+
# 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"
8688

8789
# Test install, after running the tests as for them it shouldn't be needed
8890
set -o pipefail && cmake --build . --config Release --target install -j$XCODE_JOBS | xcbeautify

0 commit comments

Comments
 (0)