summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-10-20 17:42:22 +0200
committerPetr Mrázek <peterix@gmail.com>2015-10-20 17:42:22 +0200
commit61ad48058889c50dbf54637ddf4edecdbd2f52de (patch)
tree843ef3556901f092666836a4452404c0692b0752
parent79ae4ef2f7136129c69dc00dcc40ee4e68b116c4 (diff)
downloadMultiMC-61ad48058889c50dbf54637ddf4edecdbd2f52de.tar
MultiMC-61ad48058889c50dbf54637ddf4edecdbd2f52de.tar.gz
MultiMC-61ad48058889c50dbf54637ddf4edecdbd2f52de.tar.lz
MultiMC-61ad48058889c50dbf54637ddf4edecdbd2f52de.tar.xz
MultiMC-61ad48058889c50dbf54637ddf4edecdbd2f52de.zip
NOISSUE update travis to use Qt 5.5.1
-rw-r--r--.travis.yml18
1 files changed, 3 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml
index 0894e9d9..b639b03f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,8 @@
language: cpp
cache: apt
notifications:
- email: false
+ irc: "irc.esper.net#MultiMC"
+ email: false
# Build matrix set up
compiler:
@@ -12,26 +13,13 @@ os:
- linux
# - osx
env:
- - QT_VERSION=5.4.1 # latest stable
+ - QT_VERSION=5.5.1 # latest stable
# - QT_VERSION=5.5-beta # latest
matrix:
exclude:
# only use clang on OS X
- os: osx
compiler: gcc
- # only use the qt available from homebrew
- - os: osx
- env: QT_VERSION=5.4.1
- - os: osx
- env: QT_VERSION=5.5-beta
-
- allow_failures:
- # Qt 5.5 is not yet released and is therefore allowed to fail
- - env: QT_VERSION=5.5-beta
-
-notifications:
- irc: "irc.esper.net#MultiMC"
- email: false
# Install dependencies
install: