From 3be1cdef33cde567939bf02262e386e62fb5ed25 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <nikolaykasyanov@users.noreply.github.com>
Date: Wed, 22 Jul 2020 21:54:18 +0200
Subject: [PATCH] [macOS, CI] Use Xcode 11.6 (#2970)

* [macOS, CI] Use Xcode 11.6

* [macOS, CI] Enable OpenCs build and see how it goes

* [macOS, CI] Re-enable package build and check
---
 .travis.yml             | 8 ++++----
 CI/before_script.osx.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd0e6e713c..36b15d794c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,9 @@ addons:
     build_command: "make VERBOSE=1 -j3"
 matrix:
   include:
-    - name: OpenMW (all) on MacOS 10.15 with Xcode 12
+    - name: OpenMW (all) on MacOS 10.15 with Xcode 11.6
       os: osx
-      osx_image: xcode12
+      osx_image: xcode11.6
       if: branch != coverity_scan
     - name: OpenMW (all) on Ubuntu Focal with GCC
       os: linux
@@ -71,8 +71,8 @@ before_script:
 script:
  - cd ./build
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ${ANALYZE} make -j3; fi
-# - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
-# - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi
+ - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
+ - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
  - cd "${TRAVIS_BUILD_DIR}"
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 15d6862db6..993de79fe5 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -20,7 +20,7 @@ cmake \
 -D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_OPENMW=TRUE \
--D BUILD_OPENCS=FALSE \
+-D BUILD_OPENCS=TRUE \
 -D BUILD_ESMTOOL=TRUE \
 -D BUILD_BSATOOL=TRUE \
 -D BUILD_ESSIMPORTER=TRUE \