summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-12-26 00:04:05 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-12-26 00:04:05 (GMT)
commit1656916a196a3d17a14c274660ea47b4e3ca825c (patch)
tree5d230275bd02b7ece5444acc338c4011926bef54
parent4f4216d14f5470b922bd269eede6582a72ee0687 (diff)
downloadSCons-1656916a196a3d17a14c274660ea47b4e3ca825c.zip
SCons-1656916a196a3d17a14c274660ea47b4e3ca825c.tar.gz
SCons-1656916a196a3d17a14c274660ea47b4e3ca825c.tar.bz2
have travis/install.sh echo it's commands. Hopefully get PYVER env variable set
-rw-r--r--.travis.yml17
-rwxr-xr-x.travis/install.sh27
2 files changed, 25 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index a156448..7dad533 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,16 +7,11 @@ install:
# python 3 is not fulling passing at this time
# so allow failure so the coverage stage can be reached with python 2
matrix:
- include:
- - python: 2.7
- env: PYVER=27
allow_failures:
- python: 3.5
- env: PYVER=35
- python: 3.6
- env: PYVER=36
- python: pypy
- env: PYVER=pypy
+
jobs:
include:
@@ -31,13 +26,23 @@ jobs:
before_script: skip
after_success: skip
python: 2.7
+ env: PYVER=27
+ sudo: required
- <<: *test_job
python: 3.5
+ env: PYVER=35
+ sudo: required
+
- <<: *test_job
python: 3.6
+ env: PYVER=36
+ sudo: required
+
- <<: *test_job
python: pypy
+ env: PYVER=pypy
+ sudo: required
- &coverage_jobs
diff --git a/.travis/install.sh b/.travis/install.sh
index eec6915..e095654 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -1,27 +1,28 @@
#!/usr/bin/env bash
+set -x
# dependencies for clang tests
- sudo apt-get -y install clang
+sudo apt-get -y install clang
# dependencies for gdc tests
- sudo apt-get -y install gdc
+sudo apt-get -y install gdc
# dependencies for docbook tests
- sudo apt-get -y install docbook-xml xsltproc libxml2-dev libxslt-dev fop docbook-xsl-doc-pdf
+sudo apt-get -y install docbook-xml xsltproc libxml2-dev libxslt-dev fop docbook-xsl-doc-pdf
# dependencies for latex tests
- sudo apt-get -y install texlive-full biber texmaker
+sudo apt-get -y install texlive-full biber texmaker
# need some things for building dependencies for other tests
- sudo apt-get -y install python-pip python-dev build-essential libpcre3-dev autoconf automake libtool bison subversion git
+sudo apt-get -y install python-pip python-dev build-essential libpcre3-dev autoconf automake libtool bison subversion git
# dependencies for docbook tests continued
- sudo pip install lxml
+sudo pip install lxml
# dependencies for D tests
- sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
- wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add -
- sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin
+sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
+wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add -
+sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin
# dependencies for ldc tests
- wget https://github.com/ldc-developers/ldc/releases/download/v1.4.0/ldc2-1.4.0-linux-x86_64.tar.xz
- tar xf ldc2-1.4.0-linux-x86_64.tar.xz
- sudo cp -rf ldc2-1.4.0-linux-x86_64/* /
+wget https:/ldc2/github.com/ldc-developers/ldc/releases/download/v1.4.0/ldc2-1.4.0-linux-x86_64.tar.xz
+tar xf ldc2-1.4.0-linux-x86_64.tar.xz
+sudo cp -rf -1.4.0-linux-x86_64/* /
-ls -l /usr/lib/*python*
+ls -l /usr/lib/*python*{so,a}*
# For now skip swig if py27
if [[ "$PYVER" -ne "py27" ]]; then