Browse Source

Revert "CI: Build on OSX 10.10 on travis"

This reverts commit d160cedbc327dfa8dfc0b751a8c83079f4f1b37c.
Colin Edwards 9 years ago
parent
commit
3667c6c3ba
2 changed files with 1 additions and 5 deletions
  1. 0 4
      .travis.yml
  2. 1 1
      CI/install-dependencies-osx.sh

+ 0 - 4
.travis.yml

@@ -1,5 +1,4 @@
 os: osx
-osx_image: xcode7.1
 env:
   matrix:
   - CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake
@@ -9,14 +8,11 @@ env:
   - secure: "MfhOg+84yb4ZHB2tM8PIPFQX2Y+WLN0I0iiAgyLC4KaHPUoNOyloe9yk6OjV7Lj7SZWqTlQUsqHa8S9mOUswGIody1Ydglo4RvyGOKCd8I6b2ri/jE8qHVuD9sO+sNlIxq4YqqG/qReTsbSs2YEgLneZUCYLCk/fihl8L6eVuSc="
   # secret
   - secure: "JRQVU2zgC3hY6CEY+Crmh/upp93En0BzKaLcsuBT538johNlK7m5hn3m2UOw63seLvBvVaKKWUDj9N986a3DwcXxWPMyF/9ctXgNWy39WzaVWxrbVR5nQB1fdiRp5YEgkoVN+gEm3OVF7sV5AGzh5/8CvEdRCoTLIGgMGHxW9mc="
-
 language: cpp
-
 before_install: "./CI/install-dependencies-osx.sh"
 before_script: "./CI/before-script-osx.sh"
 script: cd ./build && make -j4 && cd -
 before_deploy: "./CI/before-deploy-osx.sh"
-
 deploy:
   provider: s3
   access_key_id: $AWS_ACCESS_KEY

+ 1 - 1
CI/install-dependencies-osx.sh

@@ -1,7 +1,7 @@
 brew update
 
 #Base OBS Deps
-brew install ffmpeg x264 qt5 python cmake
+brew install ffmpeg x264 qt5 python
 
 # CEF Stuff
 cd ../