fix: streamline commitAndPush function by removing redundant code and improving error handling
This commit is contained in:
+17
-34
@@ -15,41 +15,24 @@ export async function commitAndPush(workspace) {
|
||||
.replace('https://', `https://${GITEA_TOKEN}@`)
|
||||
.replace('http://', `http://${GITEA_TOKEN}@`) + `/${GITEA_REPOSITORY}.git`;
|
||||
|
||||
// try {
|
||||
// git(['config', 'user.email', 'ai-review[bot]@gitea'], repoDir);
|
||||
// git(['config', 'user.name', 'AI Review Bot'], repoDir);
|
||||
// git(['fetch', 'origin', PR_HEAD_BRANCH], repoDir);
|
||||
// git(['checkout', PR_HEAD_BRANCH], repoDir);
|
||||
// git(['add', FINDINGS_PATH], repoDir);
|
||||
try {
|
||||
git(['config', 'user.email', 'ai-review[bot]@gitea'], repoDir);
|
||||
git(['config', 'user.name', 'AI Review Bot'], repoDir);
|
||||
git(['fetch', 'origin', PR_HEAD_BRANCH], repoDir);
|
||||
git(['checkout', PR_HEAD_BRANCH], repoDir);
|
||||
git(['add', FINDINGS_PATH], repoDir);
|
||||
|
||||
// const status = git(['status', '--porcelain'], repoDir);
|
||||
// if (!status) {
|
||||
// console.log(' findings.json 無變更,跳過 commit');
|
||||
// return;
|
||||
// }
|
||||
const status = git(['status', '--porcelain'], repoDir);
|
||||
if (!status) {
|
||||
console.log(' findings.json 無變更,跳過 commit');
|
||||
return;
|
||||
}
|
||||
|
||||
// const out = git(['commit', '-m', 'chore: update ai-review findings [skip ci]'], repoDir);
|
||||
// const commitHash = out.match(/\[.+ ([a-f0-9]+)\]/)?.[1] || 'unknown';
|
||||
// git(['push', remoteUrl, PR_HEAD_BRANCH], repoDir);
|
||||
// console.log(` ✅ persisted findings commit=${commitHash} push=${PR_HEAD_BRANCH}`);
|
||||
// } catch (e) {
|
||||
// console.log(` ⚠️ Runner failed: commit/push 失敗: ${e.message}`);
|
||||
// }
|
||||
|
||||
git(['config', 'user.email', 'ai-review[bot]@gitea'], repoDir);
|
||||
git(['config', 'user.name', 'AI Review Bot'], repoDir);
|
||||
git(['fetch', 'origin', PR_HEAD_BRANCH], repoDir);
|
||||
git(['checkout', PR_HEAD_BRANCH], repoDir);
|
||||
git(['add', FINDINGS_PATH], repoDir);
|
||||
|
||||
const status = git(['status', '--porcelain'], repoDir);
|
||||
if (!status) {
|
||||
console.log(' findings.json 無變更,跳過 commit');
|
||||
return;
|
||||
const out = git(['commit', '-m', 'chore: update ai-review findings [skip ci]'], repoDir);
|
||||
const commitHash = out.match(/\[.+ ([a-f0-9]+)\]/)?.[1] || 'unknown';
|
||||
git(['push', remoteUrl, PR_HEAD_BRANCH], repoDir);
|
||||
console.log(` ✅ persisted findings commit=${commitHash} push=${PR_HEAD_BRANCH}`);
|
||||
} catch (e) {
|
||||
console.log(` ⚠️ Runner failed: commit/push 失敗: ${e.message}`);
|
||||
}
|
||||
|
||||
const out = git(['commit', '-m', 'chore: update ai-review findings [skip ci]'], repoDir);
|
||||
const commitHash = out.match(/\[.+ ([a-f0-9]+)\]/)?.[1] || 'unknown';
|
||||
git(['push', remoteUrl, PR_HEAD_BRANCH], repoDir);
|
||||
console.log(` ✅ persisted findings commit=${commitHash} push=${PR_HEAD_BRANCH}`);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user