X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F20_install.bash;h=79e75cd2c3cf1c90de64bfa62426186967fd44c4;hb=a20e128a0ea538a145aa7327199ad0ca3612256a;hp=c8bd62a0712b76dcf0b146a0a8228dd9bd33ca0c;hpb=8785f11033369e52118799061098fb24dee2985b;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash
index c8bd62a..79e75cd 100755
--- a/maint/travis-ci_scripts/20_install.bash
+++ b/maint/travis-ci_scripts/20_install.bash
@@ -7,33 +7,36 @@ CPAN_MIRROR=$(echo "$PERL_CPANM_OPT" | grep -oP -- '--mirror\s+\S+' | head -n 1
 if ! [[ "$CPAN_MIRROR" =~ "http://" ]] ; then
   echo_err "Unable to extract primary cpan mirror from PERL_CPANM_OPT - something is wrong"
   echo_err "PERL_CPANM_OPT: $PERL_CPANM_OPT"
-  CPAN_MIRROR="http://cpan.metacpan.org/"
+  CPAN_MIRROR="https://cpan.metacpan.org/"
   PERL_CPANM_OPT="$PERL_CPANM_OPT --mirror $CPAN_MIRROR"
   echo_err "Using $CPAN_MIRROR for the time being"
 fi
 
-export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$CPAN_MIRROR"
+export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$CPAN_MIRROR" HARNESS_TIMER=1 MAKEFLAGS="-j$NUMTHREADS"
 
 # try CPAN's latest offering if requested
 if [[ "$DEVREL_DEPS" == "true" ]] ; then
 
-  if [[ "$CLEANTEST" == "true" ]] ; then
-    echo_err "DEVREL_DEPS combined with CLEANTEST makes no sense - it is only possible with cpanm"
-    exit 1
-  fi
-
   PERL_CPANM_OPT="$PERL_CPANM_OPT --dev"
 
-  # FIXME work around https://github.com/miyagawa/cpanminus/issues/308
-  TEST_BUILDER_BETA_CPAN_TARBALL="M/MS/MSCHWERN/Test-Simple-1.005000_006.tar.gz"
+  # FIXME inline-upgrade cpanm, work around https://github.com/travis-ci/travis-ci/issues/1477
+  cpanm_loc="$(which cpanm)"
+  run_or_err "Upgrading cpanm ($cpanm_loc) to latest stable" \
+    "wget -q -O $cpanm_loc cpanmin.us && chmod a+x $cpanm_loc"
 fi
 
 # Fixup CPANM_OPT to behave more like a traditional cpan client
 export PERL_CPANM_OPT="--verbose --no-interactive --no-man-pages $( echo $PERL_CPANM_OPT | sed 's/--skip-satisfied//' )"
 
 if [[ -n "$BREWVER" ]] ; then
-  run_or_err "Compiling/installing Perl $BREWVER (without testing, may take up to 5 minutes)" \
-    "perlbrew install --as $BREWVER --notest --noman --verbose $BREWOPTS -j 2  $BREWVER"
+  # since perl 5.14 a perl can safely be built concurrently with -j$large
+  # (according to brute force testing and my power bill)
+  if [[ "$BREWVER" == "blead" ]] || perl -Mversion -e "exit !!(version->new(q($BREWVER)) < 5.014)" ; then
+    perlbrew_jopt="$NUMTHREADS"
+  fi
+
+  run_or_err "Compiling/installing Perl $BREWVER (without testing, using ${perlbrew_jopt:-1} threads, may take up to 5 minutes)" \
+    "perlbrew install --as $BREWVER --notest --noman --verbose $BREWOPTS -j${perlbrew_jopt:-1}  $BREWVER"
 
   # can not do 'perlbrew uss' in the run_or_err subshell above, or a $()
   # furthermore `perlbrew use` returns 0 regardless of whether the perl is
@@ -46,6 +49,27 @@ if [[ -n "$BREWVER" ]] ; then
     exit 1
   fi
 
+# no brewver - this means a travis perl, which means we want to clean up
+# the presently installed libs
+# Idea stolen from
+# https://github.com/kentfredric/Dist-Zilla-Plugin-Prereqs-MatchInstalled-All/blob/master/maint-travis-ci/sterilize_env.pl
+elif [[ "$CLEANTEST" == "true" ]] && [[ "$POISON_ENV" != "true" ]] ; then
+
+  echo_err "$(tstamp) Cleaning precompiled Travis-Perl"
+  perl -MConfig -MFile::Find -e '
+    my $sitedirs = {
+      map { $Config{$_} => 1 }
+        grep { $_ =~ /site(lib|arch)exp$/ }
+          keys %Config
+    };
+    find({ bydepth => 1, no_chdir => 1, follow_fast => 1, wanted => sub {
+      ! $sitedirs->{$_} and ( -d _ ? rmdir : unlink )
+    } }, keys %$sitedirs )
+  '
+
+  echo_err "Post-cleanup contents of sitelib of the pre-compiled Travis-Perl $TRAVIS_PERL_VERSION:"
+  echo_err "$(tree $(perl -MConfig -e 'print $Config{sitelib_stem}'))"
+  echo_err
 fi
 
 # configure CPAN.pm - older versions go into an endless loop