Skip to content

Commit

Permalink
travis: try to update precise -> trusty
Browse files Browse the repository at this point in the history
  • Loading branch information
abma committed Apr 7, 2016
1 parent 60f6c86 commit c648e33
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ os:
- linux
# - osx

sudo: required
dist: trusty

language: cpp
compiler:
- gcc
Expand Down
10 changes: 5 additions & 5 deletions tools/scripts/travis_before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
set -e

# sdl2
sudo add-apt-repository --yes ppa:bartbes/love-stable
#sudo add-apt-repository --yes ppa:bartbes/love-stable
# cmake
sudo add-apt-repository --yes ppa:george-edison55/precise-backports
#sudo add-apt-repository --yes ppa:george-edison55/precise-backports
# gcc 4.7
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
#sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
# boost
sudo add-apt-repository --yes ppa:boost-latest/ppa
#sudo add-apt-repository --yes ppa:boost-latest/ppa

sudo apt-get update -qq
#sudo apt-get update -qq

12 changes: 6 additions & 6 deletions tools/scripts/travis_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

set -e

sudo apt-get install gcc-4.8 g++-4.8;
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90;
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90;
#sudo apt-get install gcc-4.8 g++-4.8;
#sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90;
#sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90;

sudo apt-get install libglew-dev libsdl2-dev libdevil-dev libopenal-dev libogg-dev \
libvorbis-dev libfreetype6-dev p7zip-full libxcursor-dev libunwind7-dev
sudo apt-get install -y libglew-dev libsdl2-dev libdevil-dev libopenal-dev libogg-dev \
libvorbis-dev libfreetype6-dev p7zip-full libxcursor-dev libunwind8-dev

sudo apt-get install libboost-thread1.55-dev libboost-regex1.55-dev libboost-system1.55-dev \
sudo apt-get install -y libboost-thread1.55-dev libboost-regex1.55-dev libboost-system1.55-dev \
libboost-program-options1.55-dev libboost-signals1.55-dev libboost-chrono1.55-dev \
libboost-filesystem1.55-dev libboost-test1.55-dev binutils-gold cmake cmake-data

0 comments on commit c648e33

Please sign in to comment.