From b2469de9b05d7ef920254e7625bbfb087e53cb26 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Wed, 12 Sep 2018 12:54:59 +0200 Subject: [PATCH] Do not require dashboard remote branch with the same name for hotfix --- scripts/createReleaseTarball | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/createReleaseTarball b/scripts/createReleaseTarball index df841f077..6fed766b0 100755 --- a/scripts/createReleaseTarball +++ b/scripts/createReleaseTarball @@ -41,11 +41,7 @@ fi box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD") branch=$(git rev-parse --abbrev-ref HEAD) -if [[ "${branch}" == "master" ]]; then - dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git rev-parse "${branch}") -else - dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git fetch && git rev-parse "origin/${branch}") -fi +dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git rev-parse "master") bundle_dir=$(mktemp -d -t box 2>/dev/null || mktemp -d box-XXXXXXXXXX --tmpdir=$TMPDIR) [[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${box_version:0:10}-${dashboard_version:0:10}.tar.gz"