scribus-commit
2018-11-23 00:32:34 UTC
Author: jghali
Date: Fri Nov 23 00:32:34 2018
New Revision: 22777
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22777
Log:
Bump travis to Ubuntu Xenial (16.04) and Qt 5.9
Modified:
trunk/Scribus/.travis.yml
Modified: trunk/Scribus/.travis.yml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22777&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml (original)
+++ trunk/Scribus/.travis.yml Fri Nov 23 00:32:34 2018
@@ -3,12 +3,12 @@
matrix:
include:
- os: linux
- dist: trusty
+ dist: xenial
sudo: required
compiler:
- gcc
- os: linux
- dist: trusty
+ dist: xenial
sudo: required
compiler:
- clang
@@ -19,18 +19,20 @@
compiler: gcc
- os: linux
dist: precise
+ - os: linux
+ dist: trusty
before_install:
# Linux
- if [ $TRAVIS_OS_NAME == linux ]; then
- sudo apt-add-repository ppa:beineri/opt-qt58-trusty -y;
+ sudo apt-add-repository ppa:beineri/opt-qt595-xenial -y;
sudo apt-add-repository ppa:as-bahanta/raqm -y;
sudo apt-add-repository ppa:ricotz/testing -y;
sudo apt-get update -qq;
sudo apt-get install --force-yes cmake libboost-python-dev libcups2-dev libhunspell-dev
libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev
- python-all-dev zlib1g-dev qt58base qt58declarative
- qt58tools libgraphicsmagick++1-dev
+ python-all-dev zlib1g-dev qt59base qt59declarative
+ qt59tools libgraphicsmagick++1-dev
libopenscenegraph-dev libpoppler-dev libpoppler-cpp-dev libcairo2-dev libwpg-dev
libmspub-dev libcdr-dev libvisio-dev libharfbuzz-dev libharfbuzz-icu0
coreutils binutils python-tk;
@@ -56,7 +58,7 @@
script:
- if [ $TRAVIS_OS_NAME == linux ]; then
- source /opt/qt58/bin/qt58-env.sh;
+ source /opt/qt59/bin/qt59-env.sh;
if [[ $CC == gcc ]]; then
export NPROC=8;
else
Date: Fri Nov 23 00:32:34 2018
New Revision: 22777
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22777
Log:
Bump travis to Ubuntu Xenial (16.04) and Qt 5.9
Modified:
trunk/Scribus/.travis.yml
Modified: trunk/Scribus/.travis.yml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22777&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml (original)
+++ trunk/Scribus/.travis.yml Fri Nov 23 00:32:34 2018
@@ -3,12 +3,12 @@
matrix:
include:
- os: linux
- dist: trusty
+ dist: xenial
sudo: required
compiler:
- gcc
- os: linux
- dist: trusty
+ dist: xenial
sudo: required
compiler:
- clang
@@ -19,18 +19,20 @@
compiler: gcc
- os: linux
dist: precise
+ - os: linux
+ dist: trusty
before_install:
# Linux
- if [ $TRAVIS_OS_NAME == linux ]; then
- sudo apt-add-repository ppa:beineri/opt-qt58-trusty -y;
+ sudo apt-add-repository ppa:beineri/opt-qt595-xenial -y;
sudo apt-add-repository ppa:as-bahanta/raqm -y;
sudo apt-add-repository ppa:ricotz/testing -y;
sudo apt-get update -qq;
sudo apt-get install --force-yes cmake libboost-python-dev libcups2-dev libhunspell-dev
libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev
- python-all-dev zlib1g-dev qt58base qt58declarative
- qt58tools libgraphicsmagick++1-dev
+ python-all-dev zlib1g-dev qt59base qt59declarative
+ qt59tools libgraphicsmagick++1-dev
libopenscenegraph-dev libpoppler-dev libpoppler-cpp-dev libcairo2-dev libwpg-dev
libmspub-dev libcdr-dev libvisio-dev libharfbuzz-dev libharfbuzz-icu0
coreutils binutils python-tk;
@@ -56,7 +58,7 @@
script:
- if [ $TRAVIS_OS_NAME == linux ]; then
- source /opt/qt58/bin/qt58-env.sh;
+ source /opt/qt59/bin/qt59-env.sh;
if [[ $CC == gcc ]]; then
export NPROC=8;
else