proxmox-mirrors/debcargo-conf
1
0
Fork 0
mirror of https://git.proxmox.com/git/debcargo-conf synced 2025-04-28 16:24:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

On release fail, checkout whatever previous branch it was, not hardcoded "master"

Browse Source
This commit is contained in:
Ximin Luo 2018-07-05 19:56:49 -07:00
parent bb23d707cf
commit 32c1fb5be1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release.sh
View File

@ -10,7 +10,8 @@ abort 1 "Please git-add your changes to $PKGDIR_REL before running"
RELBRANCH="pending-$PKGNAME" RELBRANCH="pending-$PKGNAME"
git fetch origin --prune git fetch origin --prune
case "$(git rev-parse --abbrev-ref HEAD)" in PREVBRANCH="$(git rev-parse --abbrev-ref HEAD)"
case "$PREVBRANCH" in
pending-$PKGNAME) true;; pending-$PKGNAME) true;;
pending-*) abort 1 "You are on a pending-release branch for a package other than $PKGNAME, $0 can only be run on another branch, like master";; pending-*) abort 1 "You are on a pending-release branch for a package other than $PKGNAME, $0 can only be run on another branch, like master";;
*) if git rev-parse -q --verify "refs/heads/$RELBRANCH" >/dev/null || \ *) if git rev-parse -q --verify "refs/heads/$RELBRANCH" >/dev/null || \
@ -22,8 +23,8 @@ pending-*) abort 1 "You are on a pending-release branch for a package other than
esac esac
if head -n1 "$PKGDIR/debian/changelog" | grep -qv UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; then if head -n1 "$PKGDIR/debian/changelog" | grep -qv UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; then
git checkout master git checkout "$PREVBRANCH"
abort 0 "Package already released. If that was a mistake then checkout another branch, delete this one ($RELBRANCH), and re-run this script ($0 $*)" abort 0 "Package already released. If that was a mistake then run \`git branch -D $RELBRANCH\`, and re-run this script ($0 $*)"
fi fi
( cd "$PKGDIR" ( cd "$PKGDIR"