summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2017-09-21 11:25:59 +0200
committerGitHub <noreply@github.com>2017-09-21 11:25:59 +0200
commit51335316fec412440ecc62ba64137be462e3a75d (patch)
tree8a658e4f03f81bc876f9a3d4d1bc314e97919ee9
parent82c8adcbe7dfac827b7eff224d08860a3b18f542 (diff)
parent97a471ed4cb4effcdc2393d997173898658f2146 (diff)
Merge pull request #3472 from vespa-engine/bjorncs/tito-tag-format
Bjorncs/tito tag format
-rw-r--r--dist/.tito/packages/.readme3
-rw-r--r--dist/.tito/tito.props6
-rwxr-xr-xdist/release-vespa-rpm.sh8
3 files changed, 14 insertions, 3 deletions
diff --git a/dist/.tito/packages/.readme b/dist/.tito/packages/.readme
new file mode 100644
index 00000000000..ae0c7fe13cc
--- /dev/null
+++ b/dist/.tito/packages/.readme
@@ -0,0 +1,3 @@
+the .tito/packages directory contains metadata files
+named after their packages. Each file has the latest tagged
+version and the project's relative directory. \ No newline at end of file
diff --git a/dist/.tito/tito.props b/dist/.tito/tito.props
new file mode 100644
index 00000000000..db2c33744dc
--- /dev/null
+++ b/dist/.tito/tito.props
@@ -0,0 +1,6 @@
+[buildconfig]
+builder = tito.builder.Builder
+tagger = tito.tagger.VersionTagger
+tag_format = {component}-{version}
+changelog_do_not_remove_cherrypick = 0
+changelog_format = %s (%ae) \ No newline at end of file
diff --git a/dist/release-vespa-rpm.sh b/dist/release-vespa-rpm.sh
index 95c0b5ce902..ba9195dff05 100755
--- a/dist/release-vespa-rpm.sh
+++ b/dist/release-vespa-rpm.sh
@@ -9,7 +9,9 @@ fi
readonly VERSION=$1
readonly GITREF=$2
-readonly SPECFILE="dist/vespa.spec"
+readonly DIST_DIR="dist"
+readonly SPECFILE="${DIST_DIR}/vespa.spec"
+readonly TITO_DIR="${DIST_DIR}/.tito"
readonly RPM_BRANCH="rpmbuild"
readonly CURRENT_BRANCH=$(git branch | grep "^\*" | cut -d' ' -f2)
@@ -22,14 +24,14 @@ git push --delete origin $RPM_BRANCH &> /dev/null || true
git branch -D $RPM_BRANCH &> /dev/null || true
git checkout -b $RPM_BRANCH $GITREF
-# Tito expects spec file to be on root
+# Tito expects spec file and .tito directory to be on root
+git mv $TITO_DIR .
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
# Push changes and tag to branc