From ecf29b3e607294893213304cf12397fa4c9b01f1 Mon Sep 17 00:00:00 2001
From: etienne-napoleone <etienne@tomochain.com>
Date: Tue, 21 Aug 2018 16:20:30 +0700
Subject: [PATCH] update .travis.yml fix release conditions

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 63c0501c50..2d17f9d0fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ jobs:
     - kill %1
 
   - stage: Github release
+    go: '1.10'
     script:
       - make tomo-linux-amd64
     deploy:
@@ -52,7 +53,7 @@ jobs:
         branch: master
         tags: true
 
-  - stage: Build and push untagged commit into image tomochain
+  - stage: Build and push tomochain image (untagged)
     services:
       - docker
     install: skip
@@ -68,7 +69,7 @@ jobs:
     after_success:
       - curl -X POST $INFRA_IMAGE_REBUILD_HOOK
 
-  - stage: Build and push tagged commit into image tomochain
+  - stage: Build and push tomochain image (tagged)
     services:
       - docker
     install: skip
@@ -88,11 +89,11 @@ stages:
   - name: Lint
   - name: Build and test
   - name: Github release
-    if: type != pull_request AND branch = master AND tag IS present AND repo = tomochain/tomochain
-  - name: Build and push untagged commit into image tomochain
+    if: type != pull_request AND branch =~ ^v AND tag IS present AND repo = tomochain/tomochain
+  - name: Build and push tomochain image (untagged)
     if: type != pull_request AND branch = master AND tag IS blank AND repo = tomochain/tomochain
-  - name: Build and push tagged commit into image tomochain
-    if: type != pull_request AND branch = master AND tag IS present AND repo = tomochain/tomochain
+  - name: Build and push tomochain image (tagged)
+    if: type != pull_request AND branch =~ ^v AND tag IS present AND repo = tomochain/tomochain
 
 notifications:
   slack: