自动同步: 2026-03-12 03:00

cron/scripts/evolver-run.sh

@@ -13,33 +13,20 @@ echo "" >> "$OUTPUT_FILE"
 # 切换到 openclaw 目录
 cd "$OPENCLAW_DIR"
 
-# 推送到远端（如果有远端）
-if git remote get-url origin &>/dev/null; then
-    echo "=== 推送到远端 ===" >> "$OUTPUT_FILE"
-    git push origin main >> "$OUTPUT_FILE" 2>&1
-    echo "推送完成" >> "$OUTPUT_FILE"
-else
-    echo "无远端配置，跳过推送" >> "$OUTPUT_FILE"
-fi
-
-echo "" >> "$OUTPUT_FILE"
-
-# 检查是否有未提交的更改
+# 检查是否有未提交的更改，先提交到 main
 if [[ -n $(git status --porcelain) ]]; then
-    echo "发现有未提交的更改，先提交..." >> "$OUTPUT_FILE"
+    echo "发现有未提交的更改，先提交到 main..." >> "$OUTPUT_FILE"
     git add -A
     git commit -m "Auto backup before evolver run - $(date)" 2>/dev/null
 fi
 
-# 创建备份分支
-BACKUP_BRANCH="backup/evolver-$(date +%Y%m%d-%H%M%S)"
-echo "创建备份分支: $BACKUP_BRANCH" >> "$OUTPUT_FILE"
-git branch -D "$BACKUP_BRANCH" 2>/dev/null || true
-git branch "$BACKUP_BRANCH" 2>/dev/null
-
-# 推送备份分支
+# 推送当前状态到 main（作为备份点）
 if git remote get-url origin &>/dev/null; then
-    git push origin "$BACKUP_BRANCH" >> "$OUTPUT_FILE" 2>&1 || echo "备份分支推送失败" >> "$OUTPUT_FILE"
+    echo "=== 推送当前状态到 main 分支 ===" >> "$OUTPUT_FILE"
+    git push origin main >> "$OUTPUT_FILE" 2>&1
+    echo "备份完成" >> "$OUTPUT_FILE"
+else
+    echo "无远端配置，跳过推送" >> "$OUTPUT_FILE"
 fi
 
 echo "" >> "$OUTPUT_FILE"
@@ -62,10 +49,10 @@ echo "" >> "$OUTPUT_FILE"
 echo "=== 本次变更 ===" >> "$OUTPUT_FILE"
 git status --short >> "$OUTPUT_FILE"
 
-# 如果有变更，推送
+# 如果有变更，推送到 main
 if [[ -n $(git status --porcelain) ]]; then
     echo "" >> "$OUTPUT_FILE"
-    echo "=== 推送变更到远端 ===" >> "$OUTPUT_FILE"
+    echo "=== 推送变更到 main 分支 ===" >> "$OUTPUT_FILE"
     git add -A
     git commit -m "Evolver auto evolution - $(date)" 2>/dev/null || true
     git push origin main >> "$OUTPUT_FILE" 2>&1 || echo "推送失败" >> "$OUTPUT_FILE"