From 8c2550f4a7dc7acdb1186fa9c6ccf320a28ba123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Tue, 27 Aug 2019 23:28:02 +0100
Subject: [PATCH] fix(ci): don't build docker image twice on merge (correct
 job)

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 59b154fb9..b3712f231 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,7 +108,7 @@ jobs:
     - stage: Build and Deploy
       # we build and push docker image on merge and tag, so this should only
       # run for new branches, to test that they don't break docker builds
-      if: repo = prymitive/karma AND type != pull_request
+      if: repo = prymitive/karma AND type != pull_request AND !(type = push AND branch = master)
       language: generic
       addons:
         apt:
@@ -119,7 +119,7 @@ jobs:
       script: travis_retry make docker-image
 
     - stage: Build and Deploy
-      if: repo = prymitive/karma AND type != pull_request AND !(type = push AND branch = master)
+      if: repo = prymitive/karma AND type != pull_request
       <<: *DEFAULTS_GO
       env:
         - DESC="Cross compile binaries"