mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-19 06:31:19 +02:00
Code Issues Projects Releases Wiki Activity

Updated travis sh

Browse Source
This commit is contained in:
MathuSum Mut
2019-02-13 13:45:03 +01:00
committed by GitHub
parent 8e6d1c0d24
commit ef4ce8fe69
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis-before_install.sh
View File

@@ -29,7 +29,8 @@ if [ "$Compiler_version" != "" ] && [ "$Compiler_version" != "default" ]; then
set -x
if [ "$VersionAvByDefault" = "" ]; then
# ubuntu test toolchain needed for more recent version of gcc and clang-6.0
sudo add-apt-repository --yes "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${codename} main"
# sudo add-apt-repository --yes "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${codename} main"
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 && sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
fi
fi
@@ -46,9 +47,9 @@ if [ "$Compiler_version" != "" ] && [ "$Compiler_version" != "default" ]; then
Gcc_AvSepGpp="$(apt-cache search ^g[c+][c+]-[0-9] | grep -v '[0-9]-[a-zA-Z]' | grep "^g++-$Compiler_version_grep")"
set -ex
if [ "$Gcc_AvSepGpp" = "" ]; then
sudo apt-get --allow-unauthenticated install -qq --force-yes gcc-${Compiler_version}
sudo apt-get install -qq -y gcc-${Compiler_version}
else
sudo apt-get --allow-unauthenticated install -qq --force-yes gcc-${Compiler_version} g++-${Compiler_version}
sudo apt-get install -qq -y gcc-${Compiler_version} g++-${Compiler_version}
fi
elif [ "$Compiler_name" = "clang" ]; then
# llvm-toolchain needed for more recent version of clang