small updates to release.sh

- use git push --atomic
- update VM name
- rename (git|pypi)-upload
This commit is contained in:
Mike Fährmann
2020-12-26 19:01:35 +01:00
parent d781e6ac44
commit df9e40ab35

View File

@@ -66,7 +66,7 @@ build-windows() {
# build windows exe in vm # build windows exe in vm
ln -fs "${ROOTDIR}" /tmp/ ln -fs "${ROOTDIR}" /tmp/
vmstart "Windows 7" & vmstart "windows7_x86_sp1" &
disown disown
while [ ! -e "gallery-dl.exe" ] ; do while [ ! -e "gallery-dl.exe" ] ; do
sleep 5 sleep 5
@@ -107,18 +107,17 @@ supportedsites() {
fi fi
} }
git-upload() { upload-git() {
cd "${ROOTDIR}" cd "${ROOTDIR}"
echo Pushing changes to github echo Pushing changes to github
git add "gallery_dl/version.py" "${README}" "${CHANGELOG}" git add "gallery_dl/version.py" "${README}" "${CHANGELOG}"
git commit -S -m "release version ${NEWVERSION}" git commit -S -m "release version ${NEWVERSION}"
git tag -s -m "version ${NEWVERSION}" "v${NEWVERSION}" git tag -s -m "version ${NEWVERSION}" "v${NEWVERSION}"
git push git push --atomic origin master "v${NEWVERSION}"
git push origin "v${NEWVERSION}"
} }
pypi-upload() { upload-pypi() {
cd "${ROOTDIR}/dist" cd "${ROOTDIR}/dist"
echo Uploading to PyPI echo Uploading to PyPI
@@ -156,6 +155,6 @@ build-python
build-linux build-linux
build-windows build-windows
sign sign
git-upload upload-git
pypi-upload upload-pypi
update-dev update-dev