Fix some spurious error messages in build_and_install.sh.

Also, update the Xcode versions for CI builds.
This commit is contained in:
Kyle Neideck 2020-07-11 17:30:02 +10:00
parent f20dd578ab
commit df02aae263
No known key found for this signature in database
GPG key ID: CAA8D9B8E39EC18C
2 changed files with 5 additions and 6 deletions

View file

@ -1,11 +1,14 @@
language: objective-c
matrix:
include:
- os: osx
osx_image: xcode12
sudo: required
env: DEPLOY=true
- os: osx
osx_image: xcode11.3
xcode_sdk: macosx10.14
sudo: required
env: DEPLOY=true
- os: osx
osx_image: xcode10.1
xcode_sdk: macosx10.14
@ -18,10 +21,6 @@ matrix:
osx_image: xcode9.4
xcode_sdk: macosx10.13
sudo: required
- os: osx
osx_image: xcode9.2
xcode_sdk: macosx10.13
sudo: required
# Fails to compile in 8.3, but it isn't clear from the logs why it fails.
# - os: osx
# osx_image: xcode8.3

View file

@ -663,7 +663,7 @@ else
fi
enableUBSanArg() {
if [[ -n "$ENABLE_UBSAN" ]]; then
if [[ "${ENABLE_UBSAN+}" != "" ]]; then
echo "-enableUndefinedBehaviorSanitizer"
echo "$ENABLE_UBSAN"
fi