From 6fd3863198a5057e99ede935e88d4f004758650a Mon Sep 17 00:00:00 2001 From: Ser Lev Arris Date: Tue, 31 Mar 2015 21:35:58 +0200 Subject: [PATCH 1/2] catch apt-get problem for wine install and install packages for MinGW + sample apps --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cfa7342f5..158994c58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,12 @@ compiler: - gcc - clang +before_install: + - sudo apt-get update -qq + - if [ $WINDOWS ]; then sudo apt-get install -qq gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 wine ; fi + - if [ $LINUX ]; then sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; fi + install: - - if [ $WINDOWS ]; then travis_retry sudo apt-get install -q -y gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64; fi - if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi script: From 0c4fb363e1649996d7e920fed1af0feb53302122 Mon Sep 17 00:00:00 2001 From: Ser Lev Arris Date: Tue, 31 Mar 2015 22:55:07 +0200 Subject: [PATCH 2/2] never work on a 13'' screen... --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 158994c58..ae3a0b983 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ before_install: + - sudo apt-get update -qq - sudo apt-get install cmake python3 + - if [ $WINDOWS ]; then sudo apt-get install -qq gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 wine ; fi + - if [ $LINUX ]; then sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; fi - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h branches: @@ -26,11 +29,6 @@ compiler: - gcc - clang -before_install: - - sudo apt-get update -qq - - if [ $WINDOWS ]; then sudo apt-get install -qq gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 wine ; fi - - if [ $LINUX ]; then sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; fi - install: - if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi