From 5b481ad8e9aa5bd66a66a8f040173a0909851467 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Thu, 19 Jan 2023 13:22:46 +0100 Subject: [PATCH 01/16] check-source: point user to missing added/deprecated schemas Print the schema diff when there are missing 'added'/'deprecated' fields. This saves some time when cleaning up code before using CI. Changelog-None --- doc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 5b9479bd2006..0d64a6fc4350 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,11 +209,11 @@ doc/index.rst: $(MANPAGES:=.md) # 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 + @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 git diff $$MASTER doc/schemas ; 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 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 + @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 git diff $$MASTER doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi schema-diff-check: schema-added-check schema-removed-check From c9fd207e34355d027b6d363353cf59e1fca03aee Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 15:01:21 +0100 Subject: [PATCH 02/16] foobar: make some schema change --- doc/schemas/listconfigs.schema.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/schemas/listconfigs.schema.json b/doc/schemas/listconfigs.schema.json index 714540873ef3..5d5b0e6510fd 100644 --- a/doc/schemas/listconfigs.schema.json +++ b/doc/schemas/listconfigs.schema.json @@ -247,6 +247,10 @@ "type": "boolean", "description": "`true` if `disable-ip-discovery` was set in config or cmdline" }, + "foobar-test": { + "type": "boolean", + "description": "`true` if `foorbar-test` was set in config or cmdline" + }, "encrypted-hsm": { "type": "boolean", "description": "`true` if `encrypted-hsm` was set in config or cmdline" From 7f3f213bf2de8558afd5e3f0d5396e6244527374 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 15:05:26 +0100 Subject: [PATCH 03/16] ci: fix github remote branch schema check --- doc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 0d64a6fc4350..d557f45ac5f1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,11 +209,11 @@ doc/index.rst: $(MANPAGES:=.md) # 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 git diff $$MASTER doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi + @if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER doc/schemas | grep -q '^+.*{' && ! git diff origin/$$MASTER doc/schemas | grep -q '^+.*"added"'; then git diff origin/$$MASTER doc/schemas ; 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 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 git diff $$MASTER doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi + @if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER doc/schemas | grep -q '^-.*{' && ! git diff origin/$$MASTER doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/$$MASTER doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi schema-diff-check: schema-added-check schema-removed-check From 5c897bf688f8e3c53d63d85b2e9db59f142a9d2d Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 15:42:07 +0100 Subject: [PATCH 04/16] ci: adds git fetch before doing schema checks This fixes the CI errors when doing `make check-source` steps 'schema-added-check' and 'schema-removed-check'. These errors prevented CI from performing these steps correctly. I changed it so that they do a `git fetch origin` at first and do the `git diff` against 'origin/master...HEAD' instead of just master. Also fixed a bug in the script that was missing $$master in the same line. ``` fatal: ambiguous argument 'main': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' ``` --- doc/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index d557f45ac5f1..22547ad34659 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,11 +209,15 @@ doc/index.rst: $(MANPAGES:=.md) # So GitHub renamed master to main. This is painful. schema-added-check: - @if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER doc/schemas | grep -q '^+.*{' && ! git diff origin/$$MASTER doc/schemas | grep -q '^+.*"added"'; then git diff origin/$$MASTER doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi + @git fetch origin master 2>&1; true + @git fetch origin main 2>&1 ; true + @if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; 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 describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER doc/schemas | grep -q '^-.*{' && ! git diff origin/$$MASTER doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/$$MASTER doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi + @git fetch origin master 2>&1; true + @git fetch origin main 2>&1 ; true + @if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi schema-diff-check: schema-added-check schema-removed-check From 4bea33cd90b0743162af16e4bdbf2042c4880a13 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 16:06:22 +0100 Subject: [PATCH 05/16] fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 22547ad34659..97a312015b01 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,15 +209,11 @@ doc/index.rst: $(MANPAGES:=.md) # So GitHub renamed master to main. This is painful. schema-added-check: - @git fetch origin master 2>&1; true - @git fetch origin main 2>&1 ; true - @if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi + @git fetch origin master 2>&1 ; git fetch origin main 2>&1 ; if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi # So GitHub renamed master to main. This is painful. schema-removed-check: - @git fetch origin master 2>&1; true - @git fetch origin main 2>&1 ; true - @if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi + @git fetch origin master 2>&1; git fetch origin main 2>&1 ; if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi schema-diff-check: schema-added-check schema-removed-check From 1a25478b55bf2c15f7138a030e18c2c6d06a1fe0 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 16:13:04 +0100 Subject: [PATCH 06/16] fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 97a312015b01..3a45d06a2844 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,11 +209,11 @@ doc/index.rst: $(MANPAGES:=.md) # So GitHub renamed master to main. This is painful. schema-added-check: - @git fetch origin master 2>&1 ; git fetch origin main 2>&1 ; if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi + @git fetch origin master ; if git diff origin/master...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff origin/master...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff origin/master...HEAD -- doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi # So GitHub renamed master to main. This is painful. schema-removed-check: - @git fetch origin master 2>&1; git fetch origin main 2>&1 ; if ! git describe origin/master >/dev/null 2>&1; then MASTER=main; else MASTER=master; fi; if git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff origin/$$MASTER...HEAD -- doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/$$MASTER...HEAD -- doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi + @git fetch origin master ; if git diff origin/master...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff origin/master...HEAD -- doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/master...HEAD -- doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi schema-diff-check: schema-added-check schema-removed-check From 7b95ec1a3ff5291960c3cc73130bf8cb82827f2f Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 22:14:53 +0100 Subject: [PATCH 07/16] fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 3a45d06a2844..79f87a73a439 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,7 +209,7 @@ doc/index.rst: $(MANPAGES:=.md) # So GitHub renamed master to main. This is painful. schema-added-check: - @git fetch origin master ; if git diff origin/master...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff origin/master...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff origin/master...HEAD -- doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi + @env ; git fetch origin master ; MASTER=`git merge-base HEAD origin/master` ; if git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff $$MASTER...HEAD -- doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi # So GitHub renamed master to main. This is painful. schema-removed-check: From 08e94fb28968ca70d9116fa863432bbd46aa5699 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 22:46:29 +0100 Subject: [PATCH 08/16] fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 79f87a73a439..5c01ff465156 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -206,14 +206,21 @@ doc/index.rst: $(MANPAGES:=.md) ) # For CI to (very roughly!) check that we only deprecated fields, or labelled added ones - -# So GitHub renamed master to main. This is painful. +# When running on GitHub (CI=true), we need to fetch origin/master schema-added-check: - @env ; git fetch origin master ; MASTER=`git merge-base HEAD origin/master` ; if git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then git diff $$MASTER...HEAD -- doc/schemas ; echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; fi - -# So GitHub renamed master to main. This is painful. + @if ! test -z $CI; then git fetch origin master; fi; \ + MASTER=`git merge-base HEAD origin/master`; \ + if git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then \ + git diff $$MASTER...HEAD -- doc/schemas; \ + echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; \ + fi schema-removed-check: - @git fetch origin master ; if git diff origin/master...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff origin/master...HEAD -- doc/schemas | grep -q '^-.*"deprecated": "'; then git diff origin/master...HEAD -- doc/schemas ; echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; fi + @if ! test -z $CI; then git fetch origin master; fi; \ + MASTER=`git merge-base HEAD origin/master`; \ + if git diff $$MASTER...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff $$MASTER...HEAD -- doc/schemas | grep -q '^-.*"deprecated"'; then \ + git diff $$MASTER...HEAD -- doc/schemas ; \ + echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; \ + fi schema-diff-check: schema-added-check schema-removed-check From 352390b534ae7f8d1e6c5b83e143759ec44bb445 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 22:55:18 +0100 Subject: [PATCH 09/16] fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 5c01ff465156..872103f9a213 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -210,15 +210,15 @@ doc/index.rst: $(MANPAGES:=.md) schema-added-check: @if ! test -z $CI; then git fetch origin master; fi; \ MASTER=`git merge-base HEAD origin/master`; \ - if git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER...HEAD -- doc/schemas | grep -q '^+.*"added"'; then \ - git diff $$MASTER...HEAD -- doc/schemas; \ + if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ + git diff $$MASTER -- doc/schemas; \ echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; \ fi schema-removed-check: @if ! test -z $CI; then git fetch origin master; fi; \ MASTER=`git merge-base HEAD origin/master`; \ - if git diff $$MASTER...HEAD -- doc/schemas | grep -q '^-.*{' && ! git diff $$MASTER...HEAD -- doc/schemas | grep -q '^-.*"deprecated"'; then \ - git diff $$MASTER...HEAD -- doc/schemas ; \ + if git diff $$MASTER -- doc/schemas | grep -q '^-.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^-.*"deprecated"'; then \ + git diff $$MASTER -- doc/schemas ; \ echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; \ fi From d054219e3d84eb163bd3cc114da4d4156c6341de Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 23:00:25 +0100 Subject: [PATCH 10/16] fixup! fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/Makefile b/doc/Makefile index 872103f9a213..cfdf55104c5b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -210,6 +210,8 @@ doc/index.rst: $(MANPAGES:=.md) schema-added-check: @if ! test -z $CI; then git fetch origin master; fi; \ MASTER=`git merge-base HEAD origin/master`; \ + echo $$MASTER; \ + echo git diff $$MASTER -- doc/schemas; \ if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ git diff $$MASTER -- doc/schemas; \ echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; \ From 04b664184586e2413bcefc83742ed9aefcaef9b9 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 23:05:37 +0100 Subject: [PATCH 11/16] fixup! fixup! fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index cfdf55104c5b..355ff499b196 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -210,8 +210,8 @@ doc/index.rst: $(MANPAGES:=.md) schema-added-check: @if ! test -z $CI; then git fetch origin master; fi; \ MASTER=`git merge-base HEAD origin/master`; \ - echo $$MASTER; \ - echo git diff $$MASTER -- doc/schemas; \ + echo MASTER=$$MASTER; \ + git diff $$MASTER -- doc/schemas; \ if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ git diff $$MASTER -- doc/schemas; \ echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; \ From d7a1b5daf3057f2e285e966dd8219e60eda22fc2 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 23:09:17 +0100 Subject: [PATCH 12/16] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index 355ff499b196..db06f6df22b4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,7 +209,7 @@ doc/index.rst: $(MANPAGES:=.md) # When running on GitHub (CI=true), we need to fetch origin/master schema-added-check: @if ! test -z $CI; then git fetch origin master; fi; \ - MASTER=`git merge-base HEAD origin/master`; \ + MASTER=$$(git merge-base HEAD origin/master); \ echo MASTER=$$MASTER; \ git diff $$MASTER -- doc/schemas; \ if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ From 56efbc34785a83b32d8cb6bf652cd85b9b516387 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 23:22:59 +0100 Subject: [PATCH 13/16] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index db06f6df22b4..353e34a63134 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -209,7 +209,8 @@ doc/index.rst: $(MANPAGES:=.md) # When running on GitHub (CI=true), we need to fetch origin/master schema-added-check: @if ! test -z $CI; then git fetch origin master; fi; \ - MASTER=$$(git merge-base HEAD origin/master); \ + MASTER=`git merge-base HEAD origin/master`; \ + git log -n1; \ echo MASTER=$$MASTER; \ git diff $$MASTER -- doc/schemas; \ if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ From 7c99a6ae9341c766c67fa1303befc31bd4cc9f05 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 23:23:46 +0100 Subject: [PATCH 14/16] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Makefile b/doc/Makefile index 353e34a63134..dbf60e3642ce 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -211,6 +211,7 @@ schema-added-check: @if ! test -z $CI; then git fetch origin master; fi; \ MASTER=`git merge-base HEAD origin/master`; \ git log -n1; \ + git branch -a; \ echo MASTER=$$MASTER; \ git diff $$MASTER -- doc/schemas; \ if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ From ce7fa0507424ff26eafb6e5ebc6aaf0df80d7314 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 23:24:51 +0100 Subject: [PATCH 15/16] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index dbf60e3642ce..f5d5c65e1398 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -211,7 +211,7 @@ schema-added-check: @if ! test -z $CI; then git fetch origin master; fi; \ MASTER=`git merge-base HEAD origin/master`; \ git log -n1; \ - git branch -a; \ + git branch; \ echo MASTER=$$MASTER; \ git diff $$MASTER -- doc/schemas; \ if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ From 8d3da0857eeaf3463767f67c2b2a874ff012390d Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Fri, 20 Jan 2023 23:42:22 +0100 Subject: [PATCH 16/16] fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! ci: adds git fetch before doing schema checks --- doc/Makefile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index f5d5c65e1398..b7951a637297 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -208,21 +208,15 @@ doc/index.rst: $(MANPAGES:=.md) # For CI to (very roughly!) check that we only deprecated fields, or labelled added ones # When running on GitHub (CI=true), we need to fetch origin/master schema-added-check: - @if ! test -z $CI; then git fetch origin master; fi; \ - MASTER=`git merge-base HEAD origin/master`; \ - git log -n1; \ - git branch; \ - echo MASTER=$$MASTER; \ - git diff $$MASTER -- doc/schemas; \ - if git diff $$MASTER -- doc/schemas | grep -q '^+.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^+.*"added"'; then \ - git diff $$MASTER -- doc/schemas; \ + @if ! test -z $$CI; then git fetch origin master; fi; \ + if git diff origin/master -- doc/schemas | grep -q '^+.*{' && ! git diff origin/master -- doc/schemas | grep -q '^+.*"added"'; then \ + git diff origin/master -- doc/schemas; \ echo 'New schema fields must have "added": "vNEXTVERSION"' >&2; exit 1; \ fi schema-removed-check: - @if ! test -z $CI; then git fetch origin master; fi; \ - MASTER=`git merge-base HEAD origin/master`; \ - if git diff $$MASTER -- doc/schemas | grep -q '^-.*{' && ! git diff $$MASTER -- doc/schemas | grep -q '^-.*"deprecated"'; then \ - git diff $$MASTER -- doc/schemas ; \ + @if ! test -z $$CI; then git fetch origin master; fi; \ + if git diff origin/master -- doc/schemas | grep -q '^-.*{' && ! git diff origin/master -- doc/schemas | grep -q '^-.*"deprecated"'; then \ + git diff origin/master -- doc/schemas ; \ echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; \ fi