diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-05 12:06:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 12:06:32 +0200 |
| commit | 2ccbd117cc7de840702659158613d5abe993604a (patch) | |
| tree | 41f259d63101c24dc27593426d71f872788b3728 /dist/release-vespa-rpm.sh | |
| parent | 1650a31708f307a8ee66c65caeea257c10af75dc (diff) | |
| parent | e349c30937b43db000f9cbf7ed2e463c74618041 (diff) | |
Merge pull request #3319 from vespa-engine/jvenstad/use-git-ref-not-tag-for-rpm
Use git ref, which must be supplied
Diffstat (limited to 'dist/release-vespa-rpm.sh')
| -rwxr-xr-x | dist/release-vespa-rpm.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dist/release-vespa-rpm.sh b/dist/release-vespa-rpm.sh index db00295bb25..e35d6d76c88 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 . @@ -31,6 +32,10 @@ mv pom.xml pom.xml.hide tito init tito tag --use-version=$VERSION --no-auto-changelog +# Create git release tag +git tag $VERSION $GITREF +git push $VERSION + # Push changes and tag to branc git push -u origin --follow-tags $RPM_BRANCH |