From 4ae1fdef05a9f52ba770cbdc743220bbbe9bc660 Mon Sep 17 00:00:00 2001 From: Elijah DeLee Date: Fri, 16 Nov 2018 09:47:33 -0500 Subject: [PATCH] Ignore differences in whitespace for schema validation --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d4857a12af..d979141ec8 100644 --- a/Makefile +++ b/Makefile @@ -578,7 +578,8 @@ docker-compose-genschema: docker-compose-validate-schema: $(MAKE) docker-compose-genschema curl https://s3.amazonaws.com/awx-public-ci-files/schema.json -o reference-schema.json - diff -u schema.json reference-schema.json + # Ignore differences in whitespace with -b + diff -u -b schema.json reference-schema.json docker-compose-clean: cd tools && CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm -w /awx_devel --service-ports awx make clean