change travis setup. remove OSX setting

This commit is contained in:
eggman 2016-06-23 07:10:37 +09:00
parent 61b0664bb3
commit 7f241c9fb1

View file

@ -10,9 +10,6 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
env: GCC_VER=4.9 env: GCC_VER=4.9
- os: osx
osx_image: xcode7
sudo: true
cache: cache:
directories: directories:
@ -21,16 +18,14 @@ cache:
addons: addons:
apt: apt:
sources: sources:
- kubuntu-backports
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- george-edison55-precise-backports
packages: packages:
- build-essential - build-essential
- ccache
- cmake - cmake
- gcc-4.9 - gcc-4.9
- libc6-i386 - libc6-i386
- python-empy - python-empy
- zlib1g-dev
before_install: before_install:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
@ -45,14 +40,6 @@ before_install:
&& . ~/.profile && . ~/.profile
&& popd && popd
; ;
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
brew tap PX4/homebrew-px4
&& brew update; brew update
&& brew install cmake ninja
&& brew install genromfs
&& sudo easy_install pip
&& sudo pip install empy
;
fi fi
before_script: before_script:
@ -72,9 +59,10 @@ before_script:
script: script:
- echo make..' && make - ccache -z
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - arm-none-eabi-gcc --version
cd ${TRAVIS_BUILD_DIR} - make archives
&& arm-none-eabi-gcc --version - ccache -s
; - make
fi - ccache -s