mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #1906 from janisozaur/language-dat
fix travis builds by forcing it to ubuntu 14.04
This commit is contained in:
commit
7d6291ad26
|
@ -17,3 +17,6 @@ cache:
|
||||||
apt: true
|
apt: true
|
||||||
|
|
||||||
sudo: required
|
sudo: required
|
||||||
|
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
|
|
|
@ -74,6 +74,7 @@ if [[ `uname` == "Darwin" ]]; then
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
elif [[ `uname` == "Linux" ]]; then
|
elif [[ `uname` == "Linux" ]]; then
|
||||||
|
sudo apt-get update
|
||||||
if [[ -z "$TRAVIS" ]]; then
|
if [[ -z "$TRAVIS" ]]; then
|
||||||
sudo apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake
|
sudo apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake
|
||||||
if [[ -z "$DISABLE_G2_BUILD" ]]; then
|
if [[ -z "$DISABLE_G2_BUILD" ]]; then
|
||||||
|
|
Loading…
Reference in New Issue