From 479b83c0f0608899e3ca8da4e43863855808619e Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <yuriastrakhan@gmail.com>
Date: Fri, 24 Apr 2020 16:44:02 -0400
Subject: [PATCH] in a CI test, print less junk (#831)
---
.github/workflows/tests.yml | 1 +
Makefile | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 886ec472..37f86b6c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -24,6 +24,7 @@ jobs:
# For now, change the quickstart values directly in the .env file
# TODO: We should probably use env vars instead
sed -i 's/QUICKSTART_MAX_ZOOM=7/QUICKSTART_MAX_ZOOM=14/g' .env
+ export QUIET=1
./quickstart.sh $area
- name: Save quickstart.log
diff --git a/Makefile b/Makefile
index b5b5f96b..5e363594 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,13 @@ else
DOCKER_COMPOSE:= docker-compose --project-name $(DC_PROJECT)
endif
+# Make some operations quieter (e.g. inside the test script)
+ifeq ($(strip $(QUIET)),)
+ QUIET_FLAG:=
+else
+ QUIET_FLAG:=--quiet
+endif
+
# Use `xargs --no-run-if-empty` flag, if supported
XARGS:=xargs $(shell xargs --no-run-if-empty </dev/null 2>/dev/null && echo --no-run-if-empty)
@@ -301,7 +308,7 @@ ifneq ($(strip $(NO_REFRESH)),)
else
@echo ""
@echo "Refreshing docker images... Use NO_REFRESH=1 to skip."
- $(DOCKER_COMPOSE) pull --ignore-pull-failures
+ $(DOCKER_COMPOSE) pull --ignore-pull-failures $(QUIET_FLAG)
endif
.PHONY: remove-docker-images