Skip to content

Commit 892887b

Browse files
committed
update release script
1 parent c3f39dd commit 892887b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ifeq ($(TAG),)
105105
@echo "WARNING: This operation will create s version tag and push to github"
106106
@read -p "Version? (provide the next x.y.z semver) : " TAG
107107
endif
108-
@( git checkout beta && git pull && git rebase dev ) || ( git checkout dev; echo "error in merging to beta branch"; exit 1 )
108+
109109
@echo "$${TAG}" > hiddifypanel/VERSION
110110
@sed -i "/^version =/c version = '$${TAG}'" pyproject.toml
111111
@sed -i "/^__version__ =/c __version__ = '$${TAG}'" hiddifypanel/VERSION.py
@@ -120,6 +120,7 @@ endif
120120
@echo "creating git tag : $${TAG}"
121121
@git tag v$${TAG}
122122
@git push -u origin HEAD --tags
123+
@git checkout beta && git rebase dev && git push \
123124
@if ! echo "$${VERSION_STR}" | grep -q "b"; then \
124125
git checkout main && git rebase dev && git push \
125126
fi

0 commit comments

Comments
 (0)