Skip to content

Commit

Permalink
package/ci: can't test on Xcode 11.7 anymore.
Browse files Browse the repository at this point in the history
Also disabling iOS tests until mosra/corrade#176
is resolved.
  • Loading branch information
mosra committed Aug 17, 2023
1 parent 4781b78 commit 6d57e20
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 6 additions & 6 deletions package/ci/circleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
emscripten:
docker:
# 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar
Expand Down Expand Up @@ -497,7 +497,7 @@ jobs:
script: unix-desktop.sh

macos:
executor: xcode-11_7
executor: xcode-12_5
environment:
CMAKE_CXX_FLAGS: --coverage
CONFIGURATION: Debug
Expand All @@ -511,7 +511,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"
Expand Down Expand Up @@ -550,7 +550,7 @@ jobs:
script: android-x86.sh

ios:
executor: xcode-11_7
executor: xcode-12_5
environment:
# Yep, xcodebuild is beyond stupid and just DOESN'T build in parallel by
# default. The default medium resource class has 4 CPUs and Ninja uses
Expand Down
4 changes: 3 additions & 1 deletion package/ci/ios-simulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ cmake .. \
-DMAGNUM_BUILD_GL_TESTS=ON \
-G Xcode
set -o pipefail && cmake --build . --config Release -j$XCODE_JOBS | xcbeautify
CORRADE_TEST_COLOR=ON ctest -V -C Release

# TODO enable again once https://github.com/mosra/corrade/pull/176 is resolved
#CORRADE_TEST_COLOR=ON ctest -V -C Release

# 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

0 comments on commit 6d57e20

Please sign in to comment.