X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F20_install.bash;h=aab2e7ef8e14dc10808d6a933b20ccf489443598;hb=ab314234bf2ad136f2d6daaf48294139ffc985ee;hp=279dafdee486d5d31b713f4c3143e751cda81a29;hpb=1864ab54ac1abe5f520678b1a6f9b4cc24004d86;p=dbsrgits%2FDBIx-Class.git diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash index 279dafd..aab2e7e 100755 --- a/maint/travis-ci_scripts/20_install.bash +++ b/maint/travis-ci_scripts/20_install.bash @@ -22,14 +22,21 @@ fi export PERL_CPANM_OPT="--verbose --no-interactive --no-man-pages $( echo $PERL_CPANM_OPT | sed 's/--skip-satisfied//' )" if [[ -n "$BREWVER" ]] ; then + # 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 + if [[ "$BREWVER" =~ [A-Za-z] ]] || perl -Mversion -e "exit !!(version->new(q($BREWVER)) < 5.014)" ; then perlbrew_jopt="$VCPU_USE" fi + BREWSRC="$BREWVER" + + if [[ "$BREWVER" == "schmorp_stableperl" ]] ; then + BREWSRC="http://stableperl.schmorp.de/dist/stableperl-5.22.0-1.001.tar.gz" + 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" + "perlbrew install --as $BREWVER --notest --noman --verbose $BREWOPTS -j${perlbrew_jopt:-1} $BREWSRC" # 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 @@ -116,3 +123,7 @@ if [[ "$CLEANTEST" != "true" ]] ; then export DBICTEST_SQLT_DEPLOY=1 fi + +# FIXME - work around https://github.com/miyagawa/cpanminus/issues/462 +# seriously... +perl -p -i -e 's/\blocal\$self->\{notest\}=1;//' $(which cpanm)