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 <antony@phenome.org>

Author: antonyantony

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)