From d7bc77e5a781709c53783fbbe38cd75432b318ac Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Fri, 16 Feb 2018 20:58:29 +0300
Subject: [PATCH] Adjust Travis setup

---
 .travis.yml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d65eb3..2ec65ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,26 +9,33 @@ services:
 
 stages:
   - test
-  - publish
+  - name: deploy
+    if: branch = master OR tag IS present
 
-before_install:
+install:
   - go get -u github.com/golang/dep/cmd/dep
+  - dep ensure
 
 jobs:
   include:
     - stage: test
       script:
-      - dep ensure
-      - go test ./...
-    - stage: publish
+      - go test -v -race ./...
+    - stage: deploy
       script:
       - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-      - dep ensure
+      - export DOCKER_TAG="${TRAVIS_TAG:-dev}"
+      - export APP_VERSION="${TRAVIS_TAG:-dev-${TRAVIS_COMMIT:0:7}}"
       - >
-        env GOOS=linux
+        env GOOS=linux GOARCH=amd64
         go build
         -o release/chrly
-        -ldflags "-X github.com/elyby/chrly/bootstrap.version=latest"
+        -ldflags "-X github.com/elyby/chrly/bootstrap.version=$APP_VERSION"
         main.go
-      - docker build -t elyby/chrly .
-      - docker push elyby/chrly
+      - docker build -t elyby/chrly:$DOCKER_TAG .
+      - docker push elyby/chrly:$DOCKER_TAG
+      - |
+        if [ -z ${TRAVIS_TAG+x} ]; then
+          docker tag elyby/chrly:$DOCKER_TAG elyby/chrly:latest
+          docker push elyby/chrly:latest
+        fi