From b6de262366f8cf44938466168968cb29cca5b93a Mon Sep 17 00:00:00 2001 From: eggman Date: Fri, 24 Jun 2016 07:03:10 +0900 Subject: [PATCH] simplify travis setting --- .travis.yml | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index d9e7b34..4b7f6c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,21 +11,12 @@ matrix: sudo: false env: GCC_VER=4.9 -cache: - directories: - - $HOME/.ccache - addons: apt: sources: - ubuntu-toolchain-r-test packages: - build-essential - - ccache - - cmake - - gcc-4.9 - - libc6-i836 - - python-empy before_install: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then @@ -36,26 +27,14 @@ before_install: && wget -O gcc.tar.bz2 ${GCC_URL} && tar -jxf gcc.tar.bz2 --strip 1 && exportline="export PATH=$HOME/gcc/bin:\$PATH" + && printenv PATH && if grep -Fxq "$exportline" ~/.profile; then echo nothing to do ; else echo $exportline >> ~/.profile; fi && . ~/.profile && popd ; fi -before_script: -# setup ccache - - mkdir -p ~/bin - - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-g++ - - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-gcc - - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-size - - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-objcopy - - export PATH=~/bin:$PATH - - script: - - ccache -z - arm-none-eabi-gcc --version - - ccache -s - make - - ccache -s