diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-09-04 15:59:16 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-09-04 15:59:16 +0200 |
| commit | 0287007ab70391de1ff3b3aed4f698927377d39d (patch) | |
| tree | af00fe7ba136314c777209c93ea9680384e60e62 /dist/release-vespa-rpm.sh | |
| parent | 9547b4ff5306c8a15a032f64f1de3132045b5d15 (diff) | |
Use git ref, which must be supplied
Diffstat (limited to 'dist/release-vespa-rpm.sh')
| -rwxr-xr-x | dist/release-vespa-rpm.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dist/release-vespa-rpm.sh b/dist/release-vespa-rpm.sh index db00295bb25..d5f969b34dc 100755 --- a/dist/release-vespa-rpm.sh +++ b/dist/release-vespa-rpm.sh @@ -2,12 +2,13 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e -if [ $# -ne 1 ]; then - echo "Usage: $0 <version>" +if [ $# -ne 2 ]; then + echo "Usage: $0 <version> <git ref>" exit 1 fi readonly VERSION=$1 +readonly GITREF=$2 readonly SPECFILE="dist/vespa.spec" readonly RPM_BRANCH="rpmbuild" readonly CURRENT_BRANCH=$(git branch | grep "^\*" | cut -d' ' -f2) @@ -17,9 +18,9 @@ git checkout master git pull --rebase # Delete existing branch if exists and create new one -git push origin :$RPM_BRANCH &> /dev/null || true +git push --delete origin &> /dev/null || true git branch -D $RPM_BRANCH &> /dev/null || true -git checkout -b $RPM_BRANCH $VERSION +git checkout -b $RPM_BRANCH $GITREF # Tito expects spec file to be on root git mv $SPECFILE . |