chore(ci) new cpan install

thibaultcha · Aug 2, 2016 · 3cc9eec · 3cc9eec
1 parent 0802ef2
commit 3cc9eec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.ci/setup_env.sh b/.ci/setup_env.sh
@@ -57,11 +57,10 @@ if [ "$OPENRESTY_TESTS" = true ]; then
   # -------------------
   # Install Test::Nginx
   # -------------------
-  git clone git://github.com/travis-perl/helpers travis-perl-helpers
-  pushd travis-perl-helpers
-    source ./init
-  popd
-  cpan-install Test::Nginx::Socket
+  curl -L https://cpanmin.us | perl - App::cpanminus
+  $PERL_DIR/bin/cpanm local::lib
+  $PERL_DIR/bin/cpanm Test::Nginx::Socket
+  echo '[ $SHLVL -eq 1 ] && eval "$(perl -I$PERL_DIR/lib/perl5 -Mlocal::lib)"' >> ~/.bashrc
 else
   # -------------------------
   # Install test dependencies

diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,7 @@ env:
   global:
     - OPENRESTY=1.9.15.1
     - OPENRESTY_DIR=$HOME/openresty
+    - PERL_DIR=$HOME/perl5
     - LUA_DIR=$HOME/lua
   matrix:
     - LUA="lua 5.1"
@@ -40,5 +41,6 @@ cache:
   apt: true
   pip: true
   directories:
+    - $PERL_DIR
     - $OPENRESTY_DIR
     - $HOME/.ccm/repository/