Skip to content

mk/yank.mk rename git branch master to main #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonyantony merged 1 commit into from
Mar 6, 2025
Merged

mk/yank.mk rename git branch master to main #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions mk/yang.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down