From 4f6605b3d102a24c9a7356d4f1b204f66b07077a Mon Sep 17 00:00:00 2001 From: James Shubin Date: Wed, 7 Oct 2015 18:03:36 -0400 Subject: [PATCH] Don't format or check omv.yaml syntax Different versions of ruby format differently, so don't do this check since it will invariably fail for someone. If there is a general deterministic fix, please let me know :) --- Makefile | 2 +- test/test-yamlfmt.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 400318bb..5e4534d0 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ test: format: find -type f -name '*.go' -not -path './old/*' -not -path './tmp/*' -exec gofmt -w {} \; - find -type f -name '*.yaml' -not -path './old/*' -not -path './tmp/*' -exec ruby -e "require 'yaml'; x=YAML.load_file('{}').to_yaml; File.open('{}', 'w').write x" \; + find -type f -name '*.yaml' -not -path './old/*' -not -path './tmp/*' -not -path './omv.yaml' -exec ruby -e "require 'yaml'; x=YAML.load_file('{}').to_yaml; File.open('{}', 'w').write x" \; docs: mgmt-documentation.pdf diff --git a/test/test-yamlfmt.sh b/test/test-yamlfmt.sh index 399eacd8..3a914dd1 100755 --- a/test/test-yamlfmt.sh +++ b/test/test-yamlfmt.sh @@ -30,6 +30,7 @@ find_files() { \( \ -wholename './old' \ -o -wholename './tmp' \ + -o -wholename './omv.yaml' \ \) -prune \ \) -name '*.yaml' }