File tree 2 files changed +12
-10
lines changed
2 files changed +12
-10
lines changed Original file line number Diff line number Diff line change @@ -15,10 +15,10 @@ executors:
15
15
ubuntu-18_04 :
16
16
docker :
17
17
- 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 :
20
20
macos :
21
- xcode : 11.7.0
21
+ xcode : 12.5.1
22
22
emscripten1 :
23
23
docker :
24
24
# 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar
@@ -505,7 +505,7 @@ jobs:
505
505
script : unix-desktop.sh
506
506
507
507
macos-gl :
508
- executor : xcode-11_7
508
+ executor : xcode-12_5
509
509
environment :
510
510
CMAKE_CXX_FLAGS : --coverage
511
511
CONFIGURATION : Debug
@@ -518,7 +518,7 @@ jobs:
518
518
- lcov
519
519
520
520
macos-gles3 :
521
- executor : xcode-11_7
521
+ executor : xcode-12_5
522
522
environment :
523
523
CMAKE_CXX_FLAGS : --coverage
524
524
CONFIGURATION : Debug
@@ -535,7 +535,7 @@ jobs:
535
535
- lcov
536
536
537
537
macos-vulkan :
538
- executor : xcode-11_7
538
+ executor : xcode-12_5
539
539
environment :
540
540
CMAKE_CXX_FLAGS : --coverage
541
541
CONFIGURATION : Debug
@@ -551,7 +551,7 @@ jobs:
551
551
- lcov
552
552
553
553
macos-static :
554
- executor : xcode-11_7
554
+ executor : xcode-12_5
555
555
environment :
556
556
# STUPID yml interprets unquoted ON as a boolean
557
557
BUILD_STATIC : " ON"
@@ -633,7 +633,7 @@ jobs:
633
633
script : android-x86-vulkan.sh
634
634
635
635
ios-gles3 :
636
- executor : xcode-11_7
636
+ executor : xcode-12_5
637
637
environment :
638
638
# STUPID yml interprets unquoted ON as a boolean
639
639
TARGET_GLES2 : " OFF"
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ cd ../..
41
41
curl --insecure -O https://www.libsdl.org/release/SDL2-2.0.10.tar.gz
42
42
tar -xzvf SDL2-2.0.10.tar.gz
43
43
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
45
45
cp build/Release-iphonesimulator/libSDL2.a $HOME /deps/lib
46
46
mkdir -p $HOME /deps/include/SDL2
47
47
cp -R ../../include/* $HOME /deps/include/SDL2
@@ -79,10 +79,12 @@ cmake .. \
79
79
-DMAGNUM_BUILD_GL_TESTS=ON \
80
80
-G Xcode
81
81
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
82
84
# TODO: find a better way to avoid
83
85
# Library not loaded: /System/Library/Frameworks/OpenGLES.framework/OpenGLES
84
86
# 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"
86
88
87
89
# Test install, after running the tests as for them it shouldn't be needed
88
90
set -o pipefail && cmake --build . --config Release --target install -j$XCODE_JOBS | xcbeautify
You can’t perform that action at this time.
0 commit comments