Update OSX image versions in .travis.yml. Add some files to the Xcode…

… project.
kyleneideck · b5cf6de2ac23aff83b2879d0ce908707f7c343e2 · kyleneideck committed Feb 15, 2017

This commit was signed with a verified signature.

kyleneideck Kyle Neideck

GPG key ID: CAA8D9B8E39EC18C Learn about signing commits · Feb 15, 2017 · b5cf6de
1 parent 8257f49
commit b5cf6de2ac23aff83b2879d0ce908707f7c343e2
Unified Split

Showing with 26 additions and 8 deletions.

+4 −4 .travis.yml

+18 −0 BGM.xcworkspace/contents.xcworkspacedata

+4 −4 build_and_install.sh
diff --git a/.travis.yml b/.travis.yml
@@ -2,17 +2,17 @@ language: objective-c
 matrix:
   include:
     - os: osx
+      osx_image: xcode8.2
+      xcode_sdk: macosx10.12
+      sudo: required
+    - os: osx
       osx_image: xcode8
       xcode_sdk: macosx10.11
       sudo: required
     - os: osx
       osx_image: xcode7.3
       xcode_sdk: macosx10.11
       sudo: required
-    - os: osx
-      osx_image: xcode7.1
-      xcode_sdk: macosx10.10
-      sudo: required
 branches:
   only:
     - master
diff --git a/BGM.xcworkspace/contents.xcworkspacedata b/BGM.xcworkspace/contents.xcworkspacedata
diff --git a/build_and_install.sh b/build_and_install.sh
@@ -469,7 +469,7 @@ echo "[1/3] Installing the virtual audio device $(bold_face ${DRIVER_DIR}) to" \
                          -target "PublicUtility" \
                          -configuration ${CONFIGURATION} \
                          RUN_CLANG_STATIC_ANALYZER=0 \
-			 ${XCODEBUILD_OPTIONS} \
+                         ${XCODEBUILD_OPTIONS} \
                          ${CLEAN} build >> ${LOG_FILE} 2>&1) &
 
 (set +e; trap - ERR
@@ -480,7 +480,7 @@ echo "[1/3] Installing the virtual audio device $(bold_face ${DRIVER_DIR}) to" \
                          -configuration ${CONFIGURATION} \
                          RUN_CLANG_STATIC_ANALYZER=0 \
                          DSTROOT="/" \
-			 ${XCODEBUILD_OPTIONS} \
+                         ${XCODEBUILD_OPTIONS} \
                          ${CLEAN} install >> ${LOG_FILE} 2>&1) &
 
 show_spinner "${BUILD_FAILED_ERROR_MSG}"
@@ -497,7 +497,7 @@ echo "[2/3] Installing $(bold_face ${XPC_HELPER_DIR}) to $(bold_face ${XPC_HELPE
                          RUN_CLANG_STATIC_ANALYZER=0 \
                          DSTROOT="/" \
                          INSTALL_PATH="${XPC_HELPER_PATH}" \
-			 ${XCODEBUILD_OPTIONS} \
+                         ${XCODEBUILD_OPTIONS} \
                          ${CLEAN} install >> ${LOG_FILE} 2>&1) &
 
 show_spinner "${BUILD_FAILED_ERROR_MSG}"
@@ -513,7 +513,7 @@ echo "[3/3] Installing $(bold_face ${APP_DIR}) to $(bold_face ${APP_PATH})." \
                          -configuration ${CONFIGURATION} \
                          RUN_CLANG_STATIC_ANALYZER=0 \
                          DSTROOT="/" \
-			 ${XCODEBUILD_OPTIONS} \
+                         ${XCODEBUILD_OPTIONS} \
                          ${CLEAN} install >> ${LOG_FILE} 2>&1) &
 
 show_spinner "${BUILD_FAILED_ERROR_MSG}"