mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-04 20:06:27 +02:00
Code Issues Projects Releases Wiki Activity

ci: update to latest circleci-multi-file-config

Browse Source 
- This loosens the ci-verify diff to ignore whitespace.
- See github.com/samsalisbury/circleci-multi-file-config@9dc5c1498202ea1ee8e395a2ddca66ab7f6a7bdb
This commit is contained in:
Sam Salisbury 2019-11-21 14:46:10 +00:00
parent 25b829360c
commit 7543d02412
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/Makefile
View File

@ -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."; \