cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

in a CI test, print less junk (#831)

Browse Source
This commit is contained in:
Yuri Astrakhan 2020-04-24 16:44:02 -04:00 committed by GitHub
parent 83f8a23bd3
commit 479b83c0f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/tests.yml vendored
View File

@ -24,6 +24,7 @@ jobs:
# For now, change the quickstart values directly in the .env file # For now, change the quickstart values directly in the .env file
# TODO: We should probably use env vars instead # TODO: We should probably use env vars instead
sed -i 's/QUICKSTART_MAX_ZOOM=7/QUICKSTART_MAX_ZOOM=14/g' .env sed -i 's/QUICKSTART_MAX_ZOOM=7/QUICKSTART_MAX_ZOOM=14/g' .env
export QUIET=1
./quickstart.sh $area ./quickstart.sh $area
- name: Save quickstart.log - name: Save quickstart.log

9
Makefile
View File

@ -10,6 +10,13 @@ else
DOCKER_COMPOSE:= docker-compose --project-name $(DC_PROJECT) DOCKER_COMPOSE:= docker-compose --project-name $(DC_PROJECT)
endif 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 # 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) 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 else
@echo "" @echo ""
@echo "Refreshing docker images... Use NO_REFRESH=1 to skip." @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 endif
.PHONY: remove-docker-images .PHONY: remove-docker-images