From 6d7703dcb622a9640f71f13d9027599b74d7864c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Mar 2019 11:19:05 -0600 Subject: [PATCH] Re-introduce `yarn test` and fix comments --- scripts/ci/unit-tests.sh | 1 + scripts/fetchdep.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ci/unit-tests.sh b/scripts/ci/unit-tests.sh index 4a5995a2e3..5b86190963 100644 --- a/scripts/ci/unit-tests.sh +++ b/scripts/ci/unit-tests.sh @@ -7,3 +7,4 @@ set -ev scripts/ci/build.sh +yarn test diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh index b9ca6a32dd..6fb50e7cea 100755 --- a/scripts/fetchdep.sh +++ b/scripts/fetchdep.sh @@ -17,9 +17,10 @@ clone() { fi } -# Try the target branch of the push or PR. -clone $BUILDKITE_BRANCH + # Try the PR author's branch in case it exists on the deps as well. +clone $BUILDKITE_BRANCH +# Try the target branch of the push or PR. clone $BUILDKITE_PULL_REQUEST_BASE_BRANCH # Try the current branch from Jenkins. clone `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`