corrected travis 6

This commit is contained in:
Stephen Gaito 2019-11-25 22:06:17 +00:00
parent 1f25183b4c
commit 7155ed25cc
3 changed files with 53 additions and 49 deletions

View File

@ -17,33 +17,33 @@ env:
global:
- UNATTENDED="--assume-yes"
addons:
apt:
update: true
packages:
# build tools
- git
- pkg-config
- ruby
- autoconf
- libtool
- cmake
- make
- gcc
- g++
- gettext
- openjdk-8-jre-headless
- tree
# dev libraries
- libcairo-dev
- libspiro-dev
- libpng-dev
- libjpeg-dev
- poppler-data
- libpango1.0-dev
- liblcms2-dev
- libxml2-dev
- libuninameslist-dev
#addons:
# apt:
# update: true
# packages:
# # build tools
# - git
# - pkg-config
# - ruby
# - autoconf
# - libtool
# - cmake
# - make
# - gcc
# - g++
# - gettext
# - openjdk-8-jre-headless
# - tree
# # dev libraries
# - libcairo-dev
# - libspiro-dev
# - libpng-dev
# - libjpeg-dev
# - poppler-data
# - libpango1.0-dev
# - liblcms2-dev
# - libxml2-dev
# - libuninameslist-dev
# homebrew:
# packages:
# - autoconf
@ -76,6 +76,8 @@ matrix:
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- ./buildScripts/getBuildTools || travis_terminate 1;
- ./buildScripts/getDevLibraries || travis_terminate 1;
- ./buildScripts/getPoppler || travis_terminate 1;
- ./buildScripts/buildPoppler || travis_terminate 1;
- ./buildScripts/installPoppler || travis_terminate 1;

View File

@ -5,18 +5,19 @@
# set the bash environment variable 'UNATTENDED' to '--assume-yes' for
# unattended use (for example in the .travis.yml script)
sudo apt $UNATTENDED install \
aptitude \
git \
pkg-config \
ruby \
autoconf \
libtool \
cmake \
make \
gcc \
g++ \
gettext \
openjdk-8-jre-headless \
sudo apt-get update
sudo apt-get $UNATTENDED install \
aptitude \
git \
pkg-config \
ruby \
autoconf \
libtool \
cmake \
make \
gcc \
g++ \
gettext \
openjdk-8-jre-headless \
tree

View File

@ -6,14 +6,15 @@
# set the bash environment variable 'UNATTENDED' to '--assume-yes' for
# unattended use (for example in the .travis.yml script)
sudo apt $UNATTENDED install \
libcairo-dev \
libspiro-dev \
libpng-dev \
libjpeg-dev \
poppler-data \
libpango1.0-dev \
liblcms2-dev \
libxml2-dev \
sudo apt-get update
sudo apt-get $UNATTENDED install \
libcairo-dev \
libspiro-dev \
libpng-dev \
libjpeg-dev \
poppler-data \
libpango1.0-dev \
liblcms2-dev \
libxml2-dev \
libuninameslist-dev