From 60791d7143c7ed5b833b288efab8ee527cab67ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Louren=C3=A7o?= Date: Tue, 31 Oct 2023 15:44:32 +0000 Subject: [PATCH 1/2] Version 7.1.10. --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 577e2e87..c5ce982f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ L:=latexmk $(F) V:=open -a skim ZIPFILES:=NOVAthesisFiles Bibliography Config Chapters LICENSE Makefile novathesis.cls README.md .gitignore template.tex latexmkrc -VERSION:=$(shell head -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/') +VERSION=$(shell head -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/') DATE:=$(shell tail -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/' | tr '\n' '@'m| sed -e 's/\(.*\)./\1/') ZIPTARGET:=$(B)-$(VERSION)@$(DATE).zip AUXFILES:=$(shell ls $(B)*.* | fgrep -v .tex | fgrep -v $(B).pdf | sed 's: :\\ :g' | sed 's:(:\\(:g' | sed 's:):\\):g') @@ -106,10 +106,19 @@ bump3: Scripts/newversion.sh 3 # $(MAKE) publish +commit: + git cam "Version $(VERSION)." + git checkout main + git pull + git merge -m \"Merge branch 'develop'\" develop + git tag -a "$(VERSION)" + git push --all --tags + git checkout develop + tag: @echo Tagging as $(VERSION) # @echo $(DATE) git co main git tag -a "$(VERSION)" - git push origin --tags + git push origin --tags --all git co develop From b5ed4409d78af32b4d2fcfaea6f213527e104092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Louren=C3=A7o?= Date: Tue, 31 Oct 2023 15:49:31 +0000 Subject: [PATCH 2/2] Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c5ce982f..08c8648d 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ commit: git cam "Version $(VERSION)." git checkout main git pull - git merge -m \"Merge branch 'develop'\" develop + git merge -m "Merge branch 'develop'" develop git tag -a "$(VERSION)" git push --all --tags git checkout develop