From 6e058375e012332c008cebc0da4bcd718baafeda Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Mon, 10 Jul 2017 18:14:36 +1000 Subject: [PATCH] travis: Fix TRAVIS_GO_VERSION handling (again) This change effectively reverts the previous e51f7f600b3251133c77d1c9789b6ab3bacf3d0f commit. TRAVIS_GO_VERSION *is* confusingly `1.8` (no patch revision) for some go versions and `1.8.3` (with patch revision) for other go versions. This change restores the previous regex pattern match, improving it to also deal with the no-patch-revision case. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0bc947c672..b289539b12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: go go: - - 1.7 - - 1.8 + - '1.7' + - '1.8' services: - docker @@ -49,7 +49,7 @@ after_success: if [[ "$TRAVIS_OS_NAME" == linux && \ "$TRAVIS_BRANCH" == master && \ "$TRAVIS_PULL_REQUEST" == false && \ - "$TRAVIS_GO_VERSION" == 1.8 ]]; then + "$TRAVIS_GO_VERSION.0" =~ ^1\.8\. ]]; then echo "Pushing :latest..." docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" quay.io docker tag $CONTROLLER_IMAGE ${CONTROLLER_IMAGE_NAME}:latest @@ -71,7 +71,7 @@ deploy: - controller.yaml - controller-norbac.yaml on: - go: 1.8 + go: '1.8' tags: true provider: releases skip_cleanup: true