mk/yang.mk fixes check main exist

push main after bumping the version

Author: antonyantony

mk/yang.mk

@@ -5,20 +5,22 @@ NEXT_VERSION := $(shell printf "%02d" "$$(($(VERSION_NOZERO) + 1))")
 PREV_VERSION := $(shell printf "%02d" "$$(($(VERSION_NOZERO) - 1))")
 SBASE := $(patsubst draft-%,%,$(BASE))
 #DTYPE := $(word 2,$(subst -, ,$(BASE)))
-PBRANCH := publish-$(SBASE)-$(VERSION)
+PBRANCH ?= publish-$(SBASE)-$(VERSION)
 PBASE := publish/$(BASE)-$(VERSION)
 VBASE := draft/$(BASE)-$(VERSION)
 LBASE := draft/$(BASE)-latest
 SHELL := /bin/bash
 MAIN_BRANCH ?= main #older repos set to master
-PUSH_TO_REMOTE ?= yes
+PUSH_TO_REMOTE ?= origin
 
 # If you have docker you can avoid having to install anything by leaving this.
 ifeq ($(CIRCLECI),)
 export DOCKRUN ?= docker run --user $(shell id -u) --network=host -v $$(pwd):/work labn/org-rfc
 endif
 EMACSCMD := $(DOCKRUN) emacs -Q --batch --debug-init --eval '(setq-default indent-tabs-mode nil)' --eval '(setq org-confirm-babel-evaluate nil)' -l ./ox-rfc.el
 
+BRANCH_EXISTS := $(shell git rev-parse --verify $(MAIN_BRANCH) 2>/dev/null)
+
 all: $(LBASE).xml $(LBASE).txt $(LBASE).html # $(LBASE).pdf
 
 clean:
@@ -36,8 +38,15 @@ else
 		git push $(PUSH_TO_REMOTE) -f --tags
 endif
 
+
+.PHONY: main-branch-check
+main-branch-check:
+ifeq ($(BRANCH_EXISTS),)
+    $(error Branch '$(MAIN_BRANCH)' does not exist. Exiting.)
+endif
+
 .PHONY: publish
-publish: git-clean-check $(VBASE).xml $(VBASE).txt $(VBASE).html
+publish: main-branch-check git-clean-check $(VBASE).xml $(VBASE).txt $(VBASE).html
 	if [ -f $(PBASE).xml ]; then echo "$(PBASE).xml already present, increment version?"; exit 1; fi
 	@mkdir -p publish
 	cp $(VBASE).xml $(VBASE).txt $(VBASE).html publish
@@ -46,11 +55,12 @@ publish: git-clean-check $(VBASE).xml $(VBASE).txt $(VBASE).html
 	git add $(PBASE).xml $(PBASE).txt $(PBASE).html
 	git commit -m "yank.mk: publish-$(SBASE)-$(VERSION)"
 	git tag -m "yank.mk: published-$(SBASE)-$(VERSION)" published-$(SBASE)-$(VERSION)
-	$(MAKE) push_to_remote
+	$(MAKE) PBRANCH=$(PBRANCH) push_to_remote
 	git checkout $(MAIN_BRANCH)
 	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 -$(NEXT_VERSION) post-publish $(SBASE)-$(VERSION)"
+	$(MAKE) PBRANCH=$(MAIN_BRANCH) push_to_remote
 
 #republish:
 #	sed -i -e 's/\#+RFC_VERSION: *\([0-9]*\)/\#+RFC_VERSION: $(PREV_VERSION)/' $(ORG)