From ef6313fbb46e94b80764ef129c443456a705b7ef Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 22:23:28 -0600 Subject: [PATCH] Use the right CI branch --- .buildkite/pipeline.yaml | 1 + scripts/fetch-develop.deps.sh | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 9ccd4abf3..55e65b052 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -23,3 +23,4 @@ steps: plugins: - docker#v3.0.1: image: "node:10" + propagate-environment: true diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index 7fbb76f4a..5c9c7848e 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -40,9 +40,8 @@ function dodep() { # Try the PR author's branch in case it exists on the deps as well. # Try the target branch of the push or PR. # Use the default branch as the last resort. - if [[ "$TRAVIS" == true ]]; then - clone $org $repo $TRAVIS_PULL_REQUEST_BRANCH || - clone $org $repo $TRAVIS_BRANCH || + if [[ "$BUILDKITE" == true ]]; then + clone $org $repo $BUILDKITE_BRANCH || clone $org $repo $defbranch || return $? else