Speedup Travis and reduce build errors by installing astyle as a package.

This commit is contained in:
Alex Parent 2016-11-14 12:13:01 -05:00 committed by Alex Parent
parent e937a6a664
commit 250681196f

View File

@ -12,10 +12,7 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- astyle
- os: linux
compiler: gcc
env: CC_OQS=gcc-4.9
@ -25,10 +22,7 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-4.9
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- astyle
- os: linux
compiler: gcc
env: CC_OQS=gcc-5
@ -38,10 +32,7 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-5
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- astyle
- os: linux
compiler: gcc
env: CC_OQS=gcc-6 USE_OPENSSL=1
@ -51,11 +42,8 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-6
- astyle
- libssl-dev
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- os: osx
compiler: clang
env: CC_OQS=clang AES_NI=0 USE_OPENSSL=1