fix: stop nested push in release hook
This commit is contained in:
@@ -67,7 +67,8 @@ fi
|
||||
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" "$ROOT_DIR/Sparkle/appcast.xml"
|
||||
|
||||
if git -C "$ROOT_DIR" diff --cached --quiet; then
|
||||
echo "release: no changes detected; skipping commit"
|
||||
echo "release: no changes detected; continuing push"
|
||||
exit 0
|
||||
else
|
||||
run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
|
||||
echo "release: commit failed (log: $RELEASE_LOG)"
|
||||
@@ -75,10 +76,5 @@ else
|
||||
}
|
||||
fi
|
||||
|
||||
if SKIP_RELEASE=1 git -C "$ROOT_DIR" push --quiet "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
|
||||
echo "release: success v${NEW_VERSION} (release commit already pushed; stopping original push)"
|
||||
echo "release: created commit for v${NEW_VERSION}; run 'git push' again to push the new release commit"
|
||||
exit 1
|
||||
else
|
||||
echo "release: push failed (log: $RELEASE_LOG)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user