travis-ci: can not use $CC, let use $GCC

This commit is contained in:
Alam Ed Arias 2016-05-27 23:06:59 -04:00
parent e3c6ee14a8
commit 590a749ded
1 changed files with 12 additions and 11 deletions

View File

@ -19,7 +19,7 @@ matrix:
- libgl1-mesa-dev - libgl1-mesa-dev
- libgme-dev - libgme-dev
- p7zip-full - p7zip-full
env: CC=gcc-4.8 env: GCC=gcc-4.8
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: addons:
@ -33,7 +33,7 @@ matrix:
- libgl1-mesa-dev - libgl1-mesa-dev
- libgme-dev - libgme-dev
- p7zip-full - p7zip-full
env: CC=gcc-4.9 env: GCC=gcc-4.9
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: addons:
@ -47,7 +47,7 @@ matrix:
- libgl1-mesa-dev - libgl1-mesa-dev
- libgme-dev - libgme-dev
- p7zip-full - p7zip-full
env: CC=gcc-5 env: GCC=gcc-5
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: addons:
@ -61,15 +61,15 @@ matrix:
- libgl1-mesa-dev - libgl1-mesa-dev
- libgme-dev - libgme-dev
- p7zip-full - p7zip-full
env: CC=gcc-6 env: GCC=gcc-6
- os: linux - os: linux
compiler: clang compiler: clang
- os: osx # - os: osx
osx_image: beta-xcode6.1 # osx_image: beta-xcode6.1
compiler: gcc # compiler: gcc
- os: osx # - os: osx
osx_image: beta-xcode6.1 # osx_image: beta-xcode6.1
compiler: clang # compiler: clang
# - os: osx # - os: osx
# osx_image: beta-xcode6.2 # osx_image: beta-xcode6.2
# compiler: gcc # compiler: gcc
@ -114,7 +114,7 @@ matrix:
# compiler: clang # compiler: clang
cache: cache:
apt: true apt: true
ccache: true ccache: true
directories: directories:
- $HOME/srb2_cache - $HOME/srb2_cache
@ -129,6 +129,7 @@ addons:
- p7zip-full - p7zip-full
before_script: before_script:
- set CC=$GCC
- $CC --version - $CC --version
- wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
- 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets