From edec42779f5124a2e8555c4e2fde7eedccc7923b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Wed, 5 Sep 2018 12:25:14 +0200
Subject: [PATCH] Fix travis builds on branches

For some reason, `docker login` doesn't work on pull requests. So we run
"docker login" only during deploy, and only on master and release
branches.
---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 786f92f..6397e10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,15 @@
-language: python
+language: minimal
 services:
   - docker
 script:
-  - make build
+  - make build-configurator
   - make configure SILENT=1
+  - make build
   - make migrate
   #- make assets # too time-consuming
-  - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
 deploy:
   provider: script
-  script: make push
+  script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && make push
   on:
-    branch: master
+    all_branches: true
+    condition: $TRAVIS_BRANCH =~ ^master|release\/.*$