From b60ab05721b56f0a083af37d223e192ebe7be934 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 21:31:33 -0400
Subject: [PATCH] travis-ci: reenable gcc-6
---
.travis.yml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2c7eb93ef..1e4caa7bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,20 +87,20 @@ matrix:
- p7zip-full
compiler: gcc-5
#gcc-5 (Ubuntu 5.3.0-3ubuntu1~14.04) 5.3.0 20151204
-# - os: linux
-# addons:
-# apt:
-# sources:
-# - ubuntu-toolchain-r-test
-# packages:
-# - gcc-6
-# - libsdl2-mixer-dev
-# - libpng-dev
-# - libgl1-mesa-dev
-# - libgme-dev
-# - p7zip-full
-# compiler: gcc-6
-# #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
+ - os: linux
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-6
+ - libsdl2-mixer-dev
+ - libpng-dev
+ - libgl1-mesa-dev
+ - libgme-dev
+ - p7zip-full
+ compiler: gcc-6
+ #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
- os: linux
compiler: clang
#clang version 3.5.0 (tags/RELEASE_350/final)
--
GitLab