From 56db13b4c82c2c79261e7de9bcc7e0296ac5e179 Mon Sep 17 00:00:00 2001 From: favilo Date: Thu, 19 Sep 2024 16:56:04 -0700 Subject: [PATCH] feat: allow us to dev-build the `master` branch from a different pipeline branch --- .buildkite/dev-docker/run.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.buildkite/dev-docker/run.sh b/.buildkite/dev-docker/run.sh index 8f8d4b9b5..c71cfdbbf 100644 --- a/.buildkite/dev-docker/run.sh +++ b/.buildkite/dev-docker/run.sh @@ -25,7 +25,12 @@ tmp_dir=$(mktemp --directory) pushd "$tmp_dir" git clone https://github.com/elastic/rally pushd rally -git checkout "${BUILD_FROM_BRANCH}" +# checkout the version from the buildkite branch, but build it from the branch we specified +if [[ ! -z "${BUILDKITE_BRANCH}" ]]; then + git checkout "${BUILDKITE_BRANCH}" +else + git checkout "${BUILD_FROM_BRANCH}" +fi git --no-pager show set -x