(travis) Much lighter CI runs when smoking a PR

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index 53ff95c..91c0cfb 100755 (executable)
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export SHORT_CIRCUIT_SMOKE
+
 # Stop pre-started RDBMS and 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"
@@ -25,6 +27,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

diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash
index c98ea7d..4a24b2f 100755 (executable)
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -3,7 +3,7 @@
 # this file is executed in a subshell - set up the common stuff
 source maint/travis-ci_scripts/common.bash
 
-if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] || [[ "$TRAVIS_PULL_REQUEST" != "false" ]] ; then exit 0 ; fi
 
 # this part needs to run in parallel unconditionally
 export VCPU_USE="$VCPU_AVAILABLE"