From: Peter Rabbitson Date: Tue, 22 Jan 2013 01:35:06 +0000 (+0100) Subject: Do not tax travis with full pull request smoking X-Git-Tag: v0.08205~3 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=e082408136cd924db8681d890c8c6493bcdb4d90 Do not tax travis with full pull request smoking --- diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash index e1649b9..a53b7ee 100755 --- a/maint/travis-ci_scripts/10_before_install.bash +++ b/maint/travis-ci_scripts/10_before_install.bash @@ -8,7 +8,10 @@ if [[ -n "$BREWVER" ]] ; then # do some extra short-circuiting here # when smoking master do not attempt bleadperl (not release-critical) - if [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$BREWVER" = "blead" ]]; then + if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then + echo_err "$(tstamp) pull-request smoking with custom perl compilation requested - bailing out" + export SHORT_CIRCUIT_SMOKE=1 + elif [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$BREWVER" = "blead" ]]; then echo_err "$(tstamp) master branch is not smoked with bleadperl - bailing out" export SHORT_CIRCUIT_SMOKE=1 # on topic/ branches test only with travis perls