Compare commits
2 commits
0537815721
...
ee3933dc77
Author | SHA1 | Date | |
---|---|---|---|
ee3933dc77 | |||
e23664b5e7 |
4 changed files with 9 additions and 5 deletions
|
@ -4,11 +4,15 @@
|
||||||
. .drone/macros/configure-ssh.sh
|
. .drone/macros/configure-ssh.sh
|
||||||
. .drone/macros/configure-gpg.sh
|
. .drone/macros/configure-gpg.sh
|
||||||
|
|
||||||
|
# Git configuration
|
||||||
|
git remote rm origin
|
||||||
|
git remote add origin git@git.platypush.tech:platypush/platypush.git
|
||||||
|
|
||||||
# Merge and push to the `stable` branch
|
# Merge and push to the `stable` branch
|
||||||
git checkout stable || git checkout -b stable
|
git checkout stable || git checkout -b stable
|
||||||
git rebase master
|
git rebase origin master
|
||||||
git push -u origin stable
|
git push -u origin stable
|
||||||
git checkout master
|
git checkout origin master
|
||||||
|
|
||||||
# Restore the original git configuration
|
# Restore the original git configuration
|
||||||
mv "$TMP_GIT_CONF" "$GIT_CONF"
|
mv "$TMP_GIT_CONF" "$GIT_CONF"
|
||||||
|
|
|
@ -23,7 +23,7 @@ when = hook
|
||||||
|
|
||||||
|
|
||||||
__author__ = 'Fabio Manganiello <fabio@manganiello.tech>'
|
__author__ = 'Fabio Manganiello <fabio@manganiello.tech>'
|
||||||
__version__ = '0.99.2'
|
__version__ = '0.99.3'
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'Application',
|
'Application',
|
||||||
'Variable',
|
'Variable',
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 0.99.2
|
current_version = 0.99.3
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
|
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -67,7 +67,7 @@ backend = pkg_files('platypush/backend')
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="platypush",
|
name="platypush",
|
||||||
version="0.99.2",
|
version="0.99.3",
|
||||||
author="Fabio Manganiello",
|
author="Fabio Manganiello",
|
||||||
author_email="fabio@manganiello.tech",
|
author_email="fabio@manganiello.tech",
|
||||||
description="Platypush service",
|
description="Platypush service",
|
||||||
|
|
Loading…
Reference in a new issue