From d365872fee0643b8fa03cae8e6bc2dd8986693f3 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 19 Nov 2020 18:19:43 +0100 Subject: [PATCH] feat: switch to gitflow --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e10cda..1209de7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ before_script: - if [ -n "$TRAVIS_TAG" ]; then VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g'); fi - - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then + - if [ "${TRAVIS_BRANCH}" == 'master' ]; then VERSION="stable"; fi @@ -88,7 +88,7 @@ jobs: 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 - - 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 annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64; docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7; @@ -96,6 +96,6 @@ jobs: fi - docker manifest push ${NAME}:${VERSION}; - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then + if [ "${TRAVIS_BRANCH}" == 'master' ]; then docker manifest push ${NAME}:latest; fi