Skip to content

Commit 48f1c8a

Browse files
committed
Make more effective use of travis cache
1 parent e98b5ed commit 48f1c8a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.travis.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,26 @@ before_install:
4949
(cd dl && tar -zxf nghttp2-${NGHTTP2}.tar.gz)
5050
fi
5151
(cd dl/nghttp2-${NGHTTP2} &&
52-
./configure --prefix=/usr --disable-threads &&
52+
[ -f Makefile ] || ./configure --prefix=/usr --disable-threads &&
5353
make && sudo make install)
5454
- |
5555
if [ ! -e dl/curl-${CURL} ]; then
5656
(cd dl && tar -zxf curl-${CURL}.tar.gz)
5757
fi
58-
(cd dl/curl-${CURL} && ./configure --with-nghttp2 --prefix=/usr/local && make && sudo make install)
58+
(cd dl/curl-${CURL} &&
59+
[ -f Makefile ] || ./configure --with-nghttp2 --prefix=/usr/local &&
60+
make && sudo make install)
5961
- sudo ldconfig
6062
- sudo cp dl/cpanm /usr/local/bin/cpanm
6163
- tar -zxf dl/nginx-${NGINX_VERSION}.tar.gz && mv nginx-${NGINX_VERSION} nginx
62-
- cpanm --notest --local-lib=perl5 local::lib && eval $(perl -I perl5/lib/perl5/ -Mlocal::lib)
64+
- cpanm --notest --local-lib=perl5 local::lib && eval $(perl -I perl5/lib/perl5/ -Mlocal::lib=./perl5)
6365
- |
6466
if [ ! -f perl5/lib/perl5/Test/Nginx.pm ]; then
65-
cpanm --notest dl/test-nginx-${TESTNGINX_VER}.tar.gz
67+
cpanm --notest --local-lib=perl5 dl/test-nginx-${TESTNGINX_VER}.tar.gz
6668
fi
6769
- |
6870
if [ ! -f perl5/lib/perl5/Test/File.pm ]; then
69-
cpanm --notest Test::File
71+
cpanm --notest --local-lib=perl5 Test::File
7072
fi
7173
7274
install:

0 commit comments

Comments
 (0)