aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2020-01-28 15:17:22 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2020-01-28 15:17:22 +0300
commit5a90fc54302a9b0e8a752b768f37885af6689ba5 (patch)
tree760533d36225a00001dbc7dd6cd87925b55866f2
parentadd safety checks to Makefile (diff)
downloadfr24feed-5a90fc54302a9b0e8a752b768f37885af6689ba5.tar.gz
fr24feed-5a90fc54302a9b0e8a752b768f37885af6689ba5.zip
Travis: prettier config
-rw-r--r--.travis.yml24
1 files changed, 11 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 6c39fe7..8ed2cdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,30 +7,28 @@ services:
addons:
apt:
- update: true
# Newer docker for BuildKit/buildx support:
+ packages:
+ - docker-ce
sources:
- key_url: 'https://download.docker.com/linux/ubuntu/gpg'
sourceline: 'deb https://download.docker.com/linux/ubuntu "$(lsb_release -cs)" stable'
- packages:
- - docker-ce
install:
- # GCR & BuildKit don't work together, e.g.:
+ # GCR & BuildKit don't place nice together, e.g.:
# https://github.com/moby/buildkit/issues/606
- echo '{}' | sudo tee /etc/docker/daemon.json
- sudo systemctl restart docker
jobs:
include:
- - name: Build and publish multi-arch images
- script: |-
- if [ "$TRAVIS_BRANCH" = master ]; then
- make login && make builder/create && make push
- else
- make builder/create && make buildx
- fi
+ - name: Build native images
+ script: make docker-build
- name: Build native images using Compose
script: sudo make install-compose && make compose-build
- - name: Build native images using Docker
- script: make docker-build
+ - name: Build multi-arch images
+ if: branch != master
+ script: make builder/create && make buildx
+ - name: Build & publish multi-arch images
+ if: branch = master
+ script: make login && make builder/create && make push