|
|
|
|
@ -10,12 +10,14 @@ executors:
|
|
|
|
|
ubuntu-18_04: |
|
|
|
|
docker: |
|
|
|
|
- image: ubuntu:bionic-20200921 |
|
|
|
|
xcode-11_4: |
|
|
|
|
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. |
|
|
|
|
macos: |
|
|
|
|
xcode: 11.4.1 |
|
|
|
|
xcode: 11.5 |
|
|
|
|
xcode-11_6: |
|
|
|
|
macos: |
|
|
|
|
xcode: 11.6.0 |
|
|
|
|
@ -458,7 +460,7 @@ jobs:
|
|
|
|
|
script: unix-desktop.sh |
|
|
|
|
|
|
|
|
|
macos-gl: |
|
|
|
|
executor: xcode-11_4 |
|
|
|
|
executor: xcode-11_5 |
|
|
|
|
environment: |
|
|
|
|
CMAKE_CXX_FLAGS: --coverage |
|
|
|
|
CONFIGURATION: Debug |
|
|
|
|
@ -471,7 +473,7 @@ jobs:
|
|
|
|
|
- lcov |
|
|
|
|
|
|
|
|
|
macos-gles3: |
|
|
|
|
executor: xcode-11_4 |
|
|
|
|
executor: xcode-11_5 |
|
|
|
|
environment: |
|
|
|
|
CMAKE_CXX_FLAGS: --coverage |
|
|
|
|
CONFIGURATION: Debug |
|
|
|
|
@ -506,7 +508,7 @@ jobs:
|
|
|
|
|
- lcov |
|
|
|
|
|
|
|
|
|
macos-static: |
|
|
|
|
executor: xcode-11_4 |
|
|
|
|
executor: xcode-11_5 |
|
|
|
|
environment: |
|
|
|
|
# STUPID yml interprets unquoted ON as a boolean |
|
|
|
|
BUILD_STATIC: "ON" |
|
|
|
|
@ -570,7 +572,7 @@ jobs:
|
|
|
|
|
script: android-x86-vulkan.sh |
|
|
|
|
|
|
|
|
|
ios-gles3: |
|
|
|
|
executor: xcode-11_4 |
|
|
|
|
executor: xcode-11_5 |
|
|
|
|
environment: |
|
|
|
|
# STUPID yml interprets unquoted ON as a boolean |
|
|
|
|
TARGET_GLES2: "OFF" |
|
|
|
|
|