X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F10_before_install.bash;h=55acf6e8dfc775ced9f3a09d95a8277d0da867a5;hb=06278456a950ad6e8bf9920f77e6d212f0d8b474;hp=53ff95ca2d70c3bd1817c19e2a593d45de711be1;hpb=5ac4a96d843a246b621d0e225cb693323f5d2227;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index 53ff95c..55acf6e 100755
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -1,10 +1,19 @@
 #!/bin/bash
 
-# Stop pre-started RDBMS and sync for some settle time
+export SHORT_CIRCUIT_SMOKE
+
+# Stop pre-started RDBMS, move their data back to disk (save RAM)
+# sync for some settle time
 run_or_err "Stopping MySQL"       "sudo /etc/init.d/mysql stop"
 run_or_err "Stopping PostgreSQL"  "sudo /etc/init.d/postgresql stop || /bin/true"
 /bin/sync
 
+for d in mysql postgresql ; do
+  sudo rm -rf /var/lib/$d
+  sudo mv /var/ramfs/$d /var/lib/
+  sudo ln -s /var/lib/$d /var/ramfs/$d
+done
+
 # Sanity check VM before continuing
 echo "
 =============================================================================
@@ -25,6 +34,17 @@ Under Travis this state usually results in a failed build.
 Short-circuiting buildjob to avoid false negatives, please restart it manually.
 
 ============================================================================="
+
+# pull requests are always scrutinized after the fact anyway - run a
+# a simpler matrix
+elif [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+  if [[ -n "$BREWVER" ]]; then
+    # just don't brew anything
+    SHORT_CIRCUIT_SMOKE=1
+  else
+    # running PRs with 1 thread is non-sensical
+    VCPU_USE=""
+  fi
 fi
 
 if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
@@ -49,7 +69,7 @@ fi
 export CACHE_DIR="/tmp/poormanscache"
 
 # these will be installed no matter what, also some extras unless CLEANTEST
-common_packages="libapp-nopaste-perl tree"
+common_packages="libapp-nopaste-perl"
 
 if [[ "$CLEANTEST" = "true" ]]; then