Merge branch 'sg/travis-gcc-4.8'

diff --git a/.travis.yml b/.travis.yml
index 36cbdea7f4f37e7eb4d5172daa4431cffcb4b46c..fc5730b085f117a16fb665a060b61e73ec18ba6c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,16 +21,10 @@ matrix:
       compiler:
       addons:
       before_install:
-    - env: jobname=Windows
+    - env: jobname=linux-gcc-4.8
       os: linux
+      dist: trusty
       compiler:
-      addons:
-      before_install:
-      script:
-        - >
-          test "$TRAVIS_REPO_SLUG" != "git/git" ||
-          ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
-      after_failure:
     - env: jobname=Linux32
       os: linux
       compiler: