Merge branch 'develop' into main

hareku · Nov 20, 2020 · 3d3f8a7 · 3d3f8a7
2 parents 836392a + 604df56
commit 3d3f8a7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,15 @@
-.PHONY: build merge
+.PHONY: build release
 
 build:
 	go build -o ./fanboxdl.out ./main.go
 
-merge:
+TAG =
+release:
 	git checkout develop;
 	git push origin develop;
 	git checkout main;
 	git merge --no-ff --no-edit develop;
 	git push origin main
+	git tag ${TAG}
+	git push origin tag ${TAG}
+	git checkout develop