(travis) Revisit the CI test matrix, and multiple run-script improvements

[dbsrgits/DBIx-Class.git] / maint / travis-ci_scripts / 10_before_install.bash

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index ddc2589..e290987 100755 (executable)
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -38,10 +38,9 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 # slurp the entire file and get the index off the last
 # `processor    : XX` line
 #
-# We also divide the result by two, otherwise the travis VM
-# gets overloaded (the amount of available swap is just TOOOO
-# damn small)
-export NUMTHREADS="$(( ( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 ) / 2 ))"
+# We also divide the result by a factor, otherwise the travis VM gets
+# overloaded (the amount of available swap is just TOOOO damn small)
+export NUMTHREADS="$(( ( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 ) / 3 ))"
 
 export CACHE_DIR="/tmp/poormanscache"
 
@@ -63,7 +62,7 @@ if [[ "$CLEANTEST" != "true" ]]; then
   # (https is critical - apt-get update can't seem to follow the 302)
   sudo bash -c 'echo -e "\ndeb [arch=i386] https://oss.oracle.com/debian unstable main non-free" >> /etc/apt/sources.list'
 
-  run_or_err "Cloning poor man's cache from github" "git clone --depth=1 --branch=poor_mans_travis_cache https://github.com/ribasushi/travis_futzing.git $CACHE_DIR && $CACHE_DIR/reassemble"
+  run_or_err "Cloning poor man's cache from github" "git clone --depth=1 --single-branch --branch=oracle/10.2.0 https://github.com/poortravis/poormanscache.git $CACHE_DIR && $CACHE_DIR/reassemble"
 
   run_or_err "Priming up the APT cache with $(echo $(ls -d $CACHE_DIR/apt_cache/*.deb))" "sudo cp $CACHE_DIR/apt_cache/*.deb /var/cache/apt/archives"