coryHawkvelt
/
docker-keepalived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: switch to gitflow

This commit is contained in:
Bertrand Gouny 2020-11-19 18:19:43 +01:00
parent 0eb9a3f41d
commit d365872fee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -51,7 +51,7 @@ before_script:
- if [ -n "$TRAVIS_TAG" ]; then - if [ -n "$TRAVIS_TAG" ]; then
VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g'); VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g');
fi fi
- if [ "${TRAVIS_BRANCH}" == 'stable' ]; then - if [ "${TRAVIS_BRANCH}" == 'master' ]; then
VERSION="stable"; VERSION="stable";
fi fi
@ -88,7 +88,7 @@ jobs:
docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8; docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
# The latest tag is coming from the stable branch of the repo # The latest tag is coming from the stable branch of the repo
- if [ "${TRAVIS_BRANCH}" == 'stable' ]; then - if [ "${TRAVIS_BRANCH}" == 'master' ]; then
docker manifest create ${NAME}:latest ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8; docker manifest create ${NAME}:latest ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64; docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7; docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
@ -96,6 +96,6 @@ jobs:
fi fi
- docker manifest push ${NAME}:${VERSION}; - docker manifest push ${NAME}:${VERSION};
if [ "${TRAVIS_BRANCH}" == 'stable' ]; then if [ "${TRAVIS_BRANCH}" == 'master' ]; then
docker manifest push ${NAME}:latest; docker manifest push ${NAME}:latest;
fi fi