Skip to content

Commit cfd88bc

Browse files
committed
update release script
1 parent 8012f16 commit cfd88bc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ ifeq ($(TAG),)
5858
endif
5959
@VERSION_STR=$$(echo $$TAG | grep -Eo '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}((b)[0-9]{1,2})?')
6060
[ ! -z "$$VERSION_STR" ] || { echo "Incorrect tag. e.g., 1.2.3 or 1.2.3b1"; exit 1; }
61+
@( git checkout beta && git pull && git merge dev ) || ( git checkout dev; echo "error in merging to beta branch"; exit 1 )
6162
@echo "$${TAG}" > VERSION
6263
@make -C ./hiddify-panel/src release TAG=$${TAG}
63-
@{git checkout beta && git pull&&git merge dev} || {git checkout dev; echo "error in merging to beta branch"; exit 1}
6464
@git tag $${TAG} > /dev/null
6565
@gitchangelog > HISTORY.md || { git tag -d $${TAG}; echo "Please run pip install gitchangelog pystache mustache markdown"; exit 2; }
6666
@git tag -d $${TAG} > /dev/null

hiddify-panel/src

Submodule src updated from 66335d1 to c9f219f

0 commit comments

Comments
 (0)