From 1ab5d993b7c395b7d19247683c7a55b6eff634e5 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Sat, 19 Dec 2015 10:56:01 +0100
Subject: [PATCH] Build on dist travis
---
.travis.yml | 8 ++------
ci/travis/before_install.sh | 25 +++++++++++++++++++------
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c41e7b8d..4c4b9990 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,10 @@ matrix:
include:
- os: osx
- os: linux
-language:
- - python
+ dist: trusty
+
env:
- PYENV_PYTHON_VERSION=3.5.0
-cache:
- directories:
- - "$HOME/.pyenv"
before_install:
- ci/travis/before_install.sh
@@ -18,7 +15,6 @@ script:
- ci/travis/test.sh
after_success:
- ci/travis/after_success.sh
-
before_deploy:
- ci/travis/before_deploy.sh
diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
index 3951a9ba..a4fd6c24 100755
--- a/ci/travis/before_install.sh
+++ b/ci/travis/before_install.sh
@@ -1,11 +1,24 @@
#!/usr/bin/env bash
-brew update
-brew install libsodium
-## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8)
-brew install qt5
-brew link --force qt5
-brew install pyenv-virtualenv
+if [ $TRAVIS_OS_NAME == "osx" ]
+then
+ brew update
+ brew install libsodium
+ ## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8)
+ brew install qt5
+ brew link --force qt5
+ brew install pyenv-virtualenv
+elif [ $TRAVIS_OS_NAME == "linux" ]
+then
+ sudo apt-get install libxcb1 libxcb1-dev libx11-xcb1 libx11-xcb-dev libxcb-keysyms1 libxcb-keysyms1-dev libxcb-image0 \
+ libxcb-image0-dev libxcb-shm0 libxcb-shm0-dev libxcb-icccm4 libxcb-icccm4-dev libxcb-sync0 libxcb-sync0-dev \
+ libxcb-xfixes0-dev libxrender-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0 \
+ libxcb-render-util0-dev libxcb-glx0-dev libgl1-mesa-dri libegl1-mesa libpcre3-dev \
+ curl qt5-qmake qtbase5-dev qttools5-dev-tools libqt5svg5-dev libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool
+ wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium13_1.0.1-1_amd64.deb
+ sudo dpkg -i libsodium13_1.0.1-1_amd64.deb
+ curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash
+fi
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
--
GitLab