From 03597143d017fd9c9084754ac5af590d215caa0b Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 6 Jun 2016 13:36:21 -0700 Subject: [PATCH] Detect use of Travis tests on Shippable. This can occur when building pre-Shippable branches or PRs. --- test/utils/run_tests.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/utils/run_tests.sh b/test/utils/run_tests.sh index f7d5a878fc4..63105c29310 100755 --- a/test/utils/run_tests.sh +++ b/test/utils/run_tests.sh @@ -1,5 +1,15 @@ #!/bin/sh +if [ "${SHIPPABLE}" = "true" ]; then + echo "It appears this job is running on Shippable instead of Travis." + if [ "${IS_PULL_REQUEST}" = "true" ]; then + echo "Please rebase the branch used for this pull request." + else + echo "This branch needs to be updated to work with Shippable." + fi + exit 1 +fi + set -e set -u set -x