diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-08-09 13:28:26 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-08-09 13:28:26 +0200 |
| commit | f154d097961c73874c94084e800c4d1861b9ae51 (patch) | |
| tree | cc0cf1740478c85959e7d26893e6eb1b03a64b7f | |
| parent | c1b3fb8dce2b66857fb528da4d94ac96902e79f6 (diff) | |
Tito tries to be clever and set versions in our pom.xml. We don't want that because not all our pom's are referenced in the base pom and stuff breaks.
| -rwxr-xr-x | dist/release-vespa-rpm.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/release-vespa-rpm.sh b/dist/release-vespa-rpm.sh index 2b4cfee71e5..fdcc7bb75c5 100755 --- a/dist/release-vespa-rpm.sh +++ b/dist/release-vespa-rpm.sh @@ -24,6 +24,9 @@ git checkout -b $RPM_BRANCH $VERSION # Tito expects spec file to be on root git mv $SPECFILE . +# Hide pom.xml to avoid tito doing anything to our pom.xml files +mv pom.xml pom.xml.hide + # Run tito to update spec file and tag tito init tito tag --use-version=$VERSION --no-auto-changelog @@ -31,5 +34,6 @@ tito tag --use-version=$VERSION --no-auto-changelog # Push changes and tag to branc git push -u origin --follow-tags $RPM_BRANCH +git reset --hard HEAD git checkout $CURRENT_BRANCH |