small updates to release.sh

- use git push --atomic
- update VM name
- rename (git|pypi)-upload
pull/1229/head
Mike Fährmann 4 years ago
parent d781e6ac44
commit df9e40ab35
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

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

Loading…
Cancel
Save