SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

travis: Fix upload of releases

Browse Source 
Yeah, that was "too simple to possibly fail". Consequently, the release
revealed two issues: The script only looked for annotated tags but they
are not used so far. Moreover, the TRAVIS_BRANCH name of a tag is that
tag and neither "master" or "next".

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2017-07-10 21:23:46 +02:00 committed by Daniel Wagner
parent 6bc7715f15
commit 1e11d314e8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.travis.yml
View File

@ -29,14 +29,16 @@ jobs:
script:
- docker build -t kasproject/kas .
- docker build -t kasproject/kas-isar -f Dockerfile.isar .
- if [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == "next" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
for IMAGE in kasproject/kas kasproject/kas-isar; do
docker push $IMAGE;
if [ "$TRAVIS_BRANCH" == "master" ] && git describe --exact-match 2>/dev/null >/dev/null; then
VERSION="$(/usr/bin/python3 -c 'from kas import __version__; print(__version__)')";
docker tag $IMAGE $IMAGE:$VERSION;
docker push $IMAGE:$VERSION;
fi
done
fi
- TAG=`git describe --exact-match --tags 2>/dev/null || echo "<none>"`
- case "$TRAVIS_BRANCH" in
master|next|"$TAG")
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
for IMAGE in kasproject/kas kasproject/kas-isar; do
docker push $IMAGE;
if [ "$TRAVIS_BRANCH" == "$TAG" ]; then
docker tag $IMAGE $IMAGE:$TAG;
docker push $IMAGE:$TAG;
fi
done
;;
esac