From 250681196f2b9bcaaed44ad313adf1c45842ccb9 Mon Sep 17 00:00:00 2001 From: Alex Parent Date: Mon, 14 Nov 2016 12:13:01 -0500 Subject: [PATCH] Speedup Travis and reduce build errors by installing astyle as a package. --- .travis.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc41ec404..10dd4813e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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