From 54bea5d0b05c95b0c239bd7c7b8ae2ec9e035367 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Mon, 23 Sep 2024 18:37:42 -0700 Subject: [PATCH] doc: Fix documentation version Changelog-Fixed: The documentation version was calculated as `pre-v24.08` for point releases like v24.08.1` also because `CLN_NEXT_VERSION` has not been included in the point release branches. Updating the script to build documentation on new tags and change the version to `pre-cln-next-version` for non-tagged commits. --- doc/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index fd59c4182646..13d199237ef3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -193,9 +193,15 @@ LOWDOWN := lowdown endif # For versions in documentation, we don't change with every git version, to -# save build time. We simply to pre-XXX and XXX. +# save build time. We build them on new tags or keep them on pre-next-release version. doc/.doc_version: version_gen.h - @if [ "$(VERSION)" = "$(CLN_NEXT_VERSION)" ]; then DOC_VERSION="$(VERSION)"; else DOC_VERSION="pre-$(CLN_NEXT_VERSION)"; fi; echo $$DOC_VERSION > $@.new + @case "$(VERSION)" in \ + *-*-g*) \ + DOC_VERSION="pre-$(CLN_NEXT_VERSION)";; \ + *) \ + DOC_VERSION="$(VERSION)";; \ + esac; \ + echo $$DOC_VERSION > $@.new @if cmp $@.new $@ >/dev/null 2>&1; then rm -f $@.new; else mv $@.new $@; $(ECHO) Documentation version updated to `cat doc/.doc_version`; fi $(MANPAGES): doc/%: doc/%.md tools/md2man.sh doc/.doc_version