From bb73601705318258519436558a63ec5e38e0de58 Mon Sep 17 00:00:00 2001 From: nanoric Date: Mon, 15 Apr 2019 08:59:57 -0400 Subject: [PATCH] [Mod] use CC and CXX (specific in MATRIX_EVAL) --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1268f55..68f911b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,9 @@ services: - mysql - postgresql +before_install: + - eval "${MATRIX_EVAL}" + before_script: - psql -d postgresql://postgres:${VNPY_TEST_POSTGRESQL_PASSWORD}@localhost -c "create database vnpy;" - mysql -u root --password=${VNPY_TEST_MYSQL_PASSWORD} -e 'CREATE DATABASE vnpy;' @@ -38,10 +41,6 @@ matrix: - g++-8 env: - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - before_install: - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90 - - sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-8 90 - - sudo update-alternatives --install /usr/bin/gcc cc /usr/bin/gcc-8 90 install: # update pip & setuptools - python -m pip install --upgrade pip wheel setuptools @@ -58,10 +57,6 @@ matrix: - g++-7 env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - before_install: - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90 - - sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-7 90 - - sudo update-alternatives --install /usr/bin/gcc cc /usr/bin/gcc-7 90 install: # Linux install script - python -m pip install --upgrade pip wheel setuptools