Skip to content

Commit 8dd4853

Browse files
committed
Cleanup travis + remove custom PHP pkgs
1 parent 9f6859f commit 8dd4853

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

.travis.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
sudo: required
2-
dist: trusty
31
language: rust
4-
52
rust:
63
- stable
74
- beta
85
- nightly
6+
sudo: false
97

108
addons:
119
apt:
1210
sources:
1311
- sourceline: 'ppa:chris-lea/libsodium'
14-
- sourceline: 'ppa:ondrej/php'
1512
- sourceline: 'deb http://ppa.launchpad.net/chris-lea/libsodium/ubuntu trusty main'
1613
- sourceline: 'deb-src http://ppa.launchpad.net/chris-lea/libsodium/ubuntu trusty main'
1714
packages:
@@ -20,20 +17,14 @@ addons:
2017
- libdw-dev
2118
- binutils-dev
2219
- libsodium-dev
23-
- php5.6
24-
- php7.0
2520

2621
before_script:
2722
- |
28-
pip install 'travis-cargo<0.2' --user
29-
3023
export PATH=$HOME/.local/bin:$PATH
3124
export LIBRARY_PATH=$HOME/lib
3225
export LD_LIBRARY_PATH=$HOME/lib
3326
export PKG_CONFIG_PATH=$HOME/lib/pkgconfig
3427
35-
cd /tmp
36-
3728
curl -sSOL https://github.com/zeromq/libzmq/releases/download/v4.2.0/zeromq-4.2.0.tar.gz
3829
tar zxf zeromq-4.2.0.tar.gz
3930
cd zeromq-4.2.0
@@ -45,13 +36,13 @@ before_script:
4536
curl -sSOL https://github.com/zeromq/czmq/releases/download/v4.0.1/czmq-4.0.1.tar.gz
4637
tar zxf czmq-4.0.1.tar.gz
4738
cd czmq-4.0.1
48-
./configure --prefix=$HOME --silent
39+
./configure --prefix=$HOME
4940
make && make install
5041
cd $TRAVIS_BUILD_DIR
5142
5243
script:
53-
- travis-cargo build
54-
- travis-cargo test
44+
- cargo build --verbose
45+
- cargo test --verbose
5546
- |
5647
ln -s "$HOME/lib/libczmq.so.4" target/debug
5748
ln -s "$HOME/lib/libzmq.so.5" target/debug
@@ -63,16 +54,13 @@ script:
6354
cd "php$VER"
6455
ln -s ../c include
6556
phpize
66-
./configure --with-inapi=../../target/debug --silent
67-
make --silent
57+
./configure --with-inapi=../../target/debug
58+
make
6859
TEST_PHP_ARGS="-q" make test || exit 1
6960
cd ..
7061
done
7162
7263
cd ..
7364
74-
after_success:
75-
- travis-cargo coveralls --no-sudo --verify --exclude-pattern="/tmp/,/usr/"
76-
7765
env:
7866
- TRAVIS_CARGO_NIGHTLY_FEATURE=""

0 commit comments

Comments
 (0)