From 9b26a39690270edfa71148a64add60073b8f1173 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Fri, 20 Dec 2019 07:40:39 -0500
Subject: [PATCH] Fixed CI for branches and PRs (#64)

---
 ci.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ci.sh b/ci.sh
index 823f3098..8b305ca0 100644
--- a/ci.sh
+++ b/ci.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 
-if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
-  docker buildx build --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x  .
-  return $?
+if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ "$TRAVIS_BRANCH" != "master" ]; then
+  docker buildx build \
+    --progress plain \
+    --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
+    .
+  exit $?
 fi
 echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin &> /dev/null
-TAG="$TRAVIS_BRANCH"
-if [ "$TAG" = "master" ]; then
-  TAG="${TRAVIS_TAG:-latest}"
-fi
+TAG="${TRAVIS_TAG:-latest}"
 echo "Building Docker images for \"$DOCKER_REPO:$TAG\""
 docker buildx build \
+    --progress plain \
     --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
     --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
     --build-arg VCS_REF=`git rev-parse --short HEAD` \