From 7543d024123471e2fc4bf69cedc8ee1842f3f5a3 Mon Sep 17 00:00:00 2001 From: Sam Salisbury Date: Thu, 21 Nov 2019 14:46:10 +0000 Subject: [PATCH] ci: update to latest circleci-multi-file-config - This loosens the ci-verify diff to ignore whitespace. - See github.com/samsalisbury/circleci-multi-file-config@9dc5c1498202ea1ee8e395a2ddca66ab7f6a7bdb --- .circleci/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/Makefile b/.circleci/Makefile index 15f29e52a4..209155cc2b 100644 --- a/.circleci/Makefile +++ b/.circleci/Makefile @@ -61,7 +61,7 @@ endef export GENERATED_FILE_HEADER # GEN_CONFIG writes the config to a temporary file. If the whole process succeeds, -# it then moves that file to $@. This makes is an atomic operation, so if it fails +# it them moves that file to $@. This makes is an atomic operation, so if it fails # make doesn't consider a half-baked file up to date. define GEN_CONFIG @$(CIRCLECI) config pack $(SOURCE_DIR) > $(CONFIG_PACKED) @@ -79,7 +79,7 @@ $(TMP): $(CONFIG_SOURCE) .PHONY: config-up-to-date config-up-to-date: $(TMP) # Note this must not depend on $(OUT)! - @if diff config.yml $<; then \ + @if diff -w $(OUT) $<; then \ echo "Generated $(OUT) is up to date!"; \ else \ echo "Generated $(OUT) is out of date, run make $(CONFIG) to update."; \