travis cleanup
This commit is contained in:
Dane Springmeyer
parent
6344b24193
commit
e26132cf9f
2 changed files with 20 additions and 36 deletions
27
.travis.yml
27
.travis.yml
|
|
@ -2,34 +2,17 @@ language: cpp
|
|||
|
||||
sudo: false
|
||||
|
||||
# travis + ubuntugis with gdal and postggis leads to many potential dead-end conflicts
|
||||
# the below is thanks to https://github.com/CartoDB/Windshaft/blob/d82fe08b32fc7907bbe907ab290f8a082215ae26/.travis.yml#L1
|
||||
before_install:
|
||||
- export PGUSER=postgres
|
||||
#- sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
|
||||
#- sudo apt-get -qq purge postgis* postgresql*
|
||||
#- sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
|
||||
# enable to test against latest boost rather that v1.48
|
||||
#- sudo add-apt-repository -y ppa:boost-latest/ppa
|
||||
#- sudo rm -Rf /var/lib/postgresql /etc/postgresql
|
||||
#- sudo apt-get update -qq
|
||||
#- sudo apt-get install -q postgresql-9.3-postgis-2.1 postgresql-contrib-9.3
|
||||
#- echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
|
||||
#- sudo service postgresql restart
|
||||
addons:
|
||||
postgresql: "9.3"
|
||||
|
||||
install:
|
||||
# enable to test against boost ppa
|
||||
#- sudo apt-get install -y ttf-wqy-microhei make valgrind python-nose
|
||||
|
||||
before_script:
|
||||
- psql -U postgres -c 'create database template_postgis'
|
||||
- psql -U postgres -c 'create extension postgis' -d template_postgis
|
||||
- psql -U postgres -c 'create database template_postgis;' -U postgres
|
||||
- psql -U postgres -c 'create extension postgis;' -d template_postgis -U postgres
|
||||
|
||||
script:
|
||||
- source bootstrap.sh
|
||||
- cat config.log
|
||||
- JOBS=4 make
|
||||
- git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
|
||||
- make test
|
||||
#- source localize.sh && make grind
|
||||
- make bench
|
||||
#- make bench
|
||||
|
|
|
|||
29
bootstrap.sh
29
bootstrap.sh
|
|
@ -23,31 +23,31 @@ SECURITY="http://security.ubuntu.com/ubuntu/pool/main/e/eglibc/"
|
|||
|
||||
function setup_linux_cpp11_toolchain() {
|
||||
if [[ ! -d ${TOOLCHAIN} ]]; then
|
||||
wget ${PPA}/libstdc%2B%2B6_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
wget -q ${PPA}/libstdc%2B%2B6_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x libstdc++6_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
wget -q ${PPA}/gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x gcc-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
wget -q ${PPA}/g%2B%2B-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x g++-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
|
||||
wget -q ${PPA}/libisl10_0.12.2-2~12.04_amd64.deb
|
||||
dpkg -x libisl10_0.12.2-2~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
|
||||
wget -q ${PPA}/libcloog-isl4_0.18.2-1~12.04_amd64.deb
|
||||
dpkg -x libcloog-isl4_0.18.2-1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
wget -q ${PPA}/libstdc%2B%2B-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x libstdc++-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
${PPA}/gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x gcc-4.8-base_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
wget -q ${PPA}/libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x libgcc-4.8-dev_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
wget -q ${PPA}/libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x libgcc1_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
wget ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
wget -q ${PPA}/cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb
|
||||
dpkg -x cpp-4.8_4.8.1-2ubuntu1~12.04_amd64.deb ${TOOLCHAIN}
|
||||
fi
|
||||
}
|
||||
|
||||
function dpack() {
|
||||
wget $1/$(echo $2 | sed 's/+/%2B/g')
|
||||
wget -q $1/$(echo $2 | sed 's/+/%2B/g')
|
||||
dpkg -x $2 ${TOOLCHAIN}
|
||||
}
|
||||
|
||||
|
|
@ -86,11 +86,11 @@ function setup_clang_toolchain() {
|
|||
#dpack ${PPA} gcc-4.8-locales_4.8.1-2ubuntu1~12.04_all.deb
|
||||
#export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/:${TOOLCHAIN}/usr/include/x86_64-linux-gnu:${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
|
||||
#dpack ${SECURITY} libc6-dev_2.15-0ubuntu10.9_amd64.deb
|
||||
#wget http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-libc-dev_3.2.0-75.110_amd64.deb
|
||||
#wget -q http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-libc-dev_3.2.0-75.110_amd64.deb
|
||||
#dpkg -x linux-libc-dev_3.2.0-75.110_amd64.deb ${TOOLCHAIN}
|
||||
#wget http://mirrors.kernel.org/ubuntu/pool/main/b/binutils/binutils-gold_2.22-6ubuntu1.1_amd64.deb
|
||||
#wget -q http://mirrors.kernel.org/ubuntu/pool/main/b/binutils/binutils-gold_2.22-6ubuntu1.1_amd64.deb
|
||||
#dpkg -x binutils-gold_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
|
||||
#wget http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils_2.22-6ubuntu1.1_amd64.deb
|
||||
#wget -q http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils_2.22-6ubuntu1.1_amd64.deb
|
||||
#dpkg -x binutils_2.22-6ubuntu1.1_amd64.deb ${TOOLCHAIN}
|
||||
}
|
||||
|
||||
|
|
@ -147,11 +147,12 @@ if [[ $(uname -s) == 'Linux' ]]; then
|
|||
setup_clang_toolchain
|
||||
export CPLUS_INCLUDE_PATH="${TOOLCHAIN}/usr/include/c++/4.8:${TOOLCHAIN}/usr/include/x86_64-linux-gnu/c++/4.8:${CPLUS_INCLUDE_PATH}"
|
||||
export LD_LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}"
|
||||
export LIBRARY_PATH="${TOOLCHAIN}/usr/lib/x86_64-linux-gnu:${LIBRARY_PATH}"
|
||||
export PATH=${TOOLCHAIN}/usr/bin:$PATH
|
||||
#sudo apt-get -y install zlib1g-dev python-dev make git python-dev python-nose
|
||||
fi
|
||||
|
||||
wget https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz
|
||||
wget -q https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz
|
||||
tar -xzf nose-1.3.4.tar.gz
|
||||
export PYTHONPATH=$(pwd)/nose-1.3.4:${PYTHONPATH}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue