From 2b5f4d14d112d7eb755615c6f561298fd6aa0cd3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 12 Jan 2023 16:38:02 +1030 Subject: [PATCH] CI: fix schema diff check. GitHub's master branch is called "main" apparently. Signed-off-by: Rusty Russell --- doc/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index da1e85242..5b9479bd2 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -206,11 +206,14 @@ doc/index.rst: $(MANPAGES:=.md) ) # For CI to (very roughly!) check that we only deprecated fields, or labelled added ones -schema-added-check: - @if git diff master doc/schemas | grep -q '^+.*{' && ! git diff master doc/schemas | grep -q '^+.*"added"'; then echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi +# So GitHub renamed master to main. This is painful. +schema-added-check: + @if ! git describe master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff $$MASTER doc/schemas | grep -q '^+.*{' && ! git diff master doc/schemas | grep -q '^+.*"added"'; then echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi + +# So GitHub renamed master to main. This is painful. schema-removed-check: - @if git diff master doc/schemas | grep -q '^-.*{' && ! git diff master doc/schemas | grep -q '^-.*"deprecated": "'; then echo 'Schema fields must be deprecated, with version, not removed' >&2; exit 1; fi + @if ! git describe master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff $$MASTER doc/schemas | grep -q '^-.*{' && ! git diff master doc/schemas | grep -q '^-.*"deprecated": "'; then echo 'Schema fields must be deprecated, with version, not removed' >&2; exit 1; fi schema-diff-check: schema-added-check schema-removed-check