File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ ifeq ($(TAG),)
105
105
@echo "WARNING: This operation will create s version tag and push to github"
106
106
@read -p "Version? (provide the next x.y.z semver) : " TAG
107
107
endif
108
- @( git checkout beta && git pull && git rebase dev ) || ( git checkout dev; echo "error in merging to beta branch"; exit 1 )
108
+
109
109
@echo "$${TAG}" > hiddifypanel/VERSION
110
110
@sed -i "/^version =/c version = '$${TAG}'" pyproject.toml
111
111
@sed -i "/^__version__ =/c __version__ = '$${TAG}'" hiddifypanel/VERSION.py
@@ -120,6 +120,7 @@ endif
120
120
@echo "creating git tag : $${TAG}"
121
121
@git tag v$${TAG}
122
122
@git push -u origin HEAD --tags
123
+ @git checkout beta && git rebase dev && git push \
123
124
@if ! echo "$${VERSION_STR}" | grep -q "b"; then \
124
125
git checkout main && git rebase dev && git push \
125
126
fi
You can’t perform that action at this time.
0 commit comments