From 485a1b1e3ba99ce7be01a1c7e260caadf064f863 Mon Sep 17 00:00:00 2001 From: Koncord Date: Sun, 4 Sep 2016 17:58:28 +0800 Subject: [PATCH] Disable OS X in Travis CI --- .travis.yml | 5 ++--- CI/before_install.linux.sh | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e6f92891..5f592119a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ os: - linux - - osx -osx_image: xcode7.2 +# - osx +#osx_image: xcode7.2 language: cpp sudo: required dist: trusty @@ -55,7 +55,6 @@ matrix: - env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 " before_install: - - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- - ./CI/before_install.${TRAVIS_OS_NAME}.sh before_script: ./CI/before_script.${TRAVIS_OS_NAME}.sh script: diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh index 67a27869a..f4b448900 100755 --- a/CI/before_install.linux.sh +++ b/CI/before_install.linux.sh @@ -1,4 +1,5 @@ #!/bin/sh +echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- sudo ln -s /usr/bin/clang-3.6 /usr/local/bin/clang sudo ln -s /usr/bin/clang++-3.6 /usr/local/bin/clang++