From f732c6173dd987dc8cdb4406f1c3d79066e84c47 Mon Sep 17 00:00:00 2001 From: Antony Antony Date: Tue, 15 Oct 2024 13:58:46 +0200 Subject: [PATCH] mk/yank.mk rename git branch master to main these days main is the default on github. add new version number to git commit message; post-publish push after merging to main Signed-off-by: Antony Antony --- mk/yang.mk | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mk/yang.mk b/mk/yang.mk index f2ba07c..a9ec5e1 100644 --- a/mk/yang.mk +++ b/mk/yang.mk @@ -27,18 +27,19 @@ git-clean-check: .PHONY: publish publish: git-clean-check $(VBASE).xml $(VBASE).txt $(VBASE).html -# if [ -f $(PBASE).xml ]; then echo "$(PBASE).xml already present, increment version?"; exit 1; fi -# cp $(VBASE).xml $(VBASE).txt $(VBASE).html publish -# git checkout -b $(PBRANCH) -# git tag -m "yank.mk publish-$(DTYPE)-$(VERSION)" bp-$(PBRANCH) -# git push -f --tags -# git add $(PBASE).xml $(PBASE).txt $(PBASE).html -# git commit -m "yank.mk publish-$(DTYPE)-$(VERSION)" -# git push origin $(PBRANCH) -# git checkout main + if [ -f $(PBASE).xml ]; then echo "$(PBASE).xml already present, increment version?"; exit 1; fi + cp $(VBASE).xml $(VBASE).txt $(VBASE).html publish + git checkout -b $(PBRANCH) + git tag -m "yank.mk publish-$(DTYPE)-$(VERSION)" bp-$(PBRANCH) + git push -f --tags + git add $(PBASE).xml $(PBASE).txt $(PBASE).html + git commit -m "yank.mk publish-$(DTYPE)-$(VERSION)" + git push origin $(PBRANCH) + git checkout main git merge --ff-only $(PBRANCH) sed -i -e 's/\#+RFC_VERSION: *\([0-9]*\)/\#+RFC_VERSION: $(NEXT_VERSION)/' $(ORG) - git commit -am "yank.mk new version post-publish" + git commit -am "yank.mk new version -$(NEXT_VERSION) post-publish" + git push origin #republish: # sed -i -e 's/\#+RFC_VERSION: *\([0-9]*\)/\#+RFC_VERSION: $(PREV_VERSION)/' $(ORG)