diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-21 11:22:57 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-21 11:23:44 +0200 |
| commit | 97a471ed4cb4effcdc2393d997173898658f2146 (patch) | |
| tree | 7601e918edb03b7cc9b14ba3bc109e930866cfd3 | |
| parent | 7e8feefa21171980ac5f36b54b75b29e83f2876e (diff) | |
Move .tito directory under dist/
| -rw-r--r-- | dist/.tito/packages/.readme (renamed from .tito/packages/.readme) | 0 | ||||
| -rw-r--r-- | dist/.tito/tito.props (renamed from .tito/tito.props) | 0 | ||||
| -rwxr-xr-x | dist/release-vespa-rpm.sh | 7 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.tito/packages/.readme b/dist/.tito/packages/.readme index ae0c7fe13cc..ae0c7fe13cc 100644 --- a/.tito/packages/.readme +++ b/dist/.tito/packages/.readme diff --git a/.tito/tito.props b/dist/.tito/tito.props index db2c33744dc..db2c33744dc 100644 --- a/.tito/tito.props +++ b/dist/.tito/tito.props diff --git a/dist/release-vespa-rpm.sh b/dist/release-vespa-rpm.sh index 0ff2d9db755..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,7 +24,8 @@ 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 |