fix: 修复git容错处理,修复启动脚本语法错误
This commit is contained in:
@@ -96,7 +96,7 @@ while true; do
|
||||
|
||||
# 自动推送完成结果
|
||||
# 添加.done文件和已删除的.task文件
|
||||
git add "$DONE_FILE" "$TASK_FILE" >> "$LOG_FILE" 2>&1
|
||||
git add "$DONE_FILE" >> "$LOG_FILE" 2>&1
|
||||
UNCOMMITTED=$(git status --porcelain | grep -E "($DONE_FILE|$TASK_FILE)" || true)
|
||||
if [ -n "$UNCOMMITTED" ]; then
|
||||
log_info "[$TIMESTAMP] 📤 正在推送完成结果..."
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# 极简分配脚本 - 彻底修复,简单直接方案
|
||||
# 极简分配脚本 - 带git容错处理
|
||||
|
||||
if [ $# -lt 2 ]; then
|
||||
echo "使用方法: ./assign_simple.sh <任务ID> <负责人>"
|
||||
@@ -14,6 +14,12 @@ PENDING_FILE="management/tasks/pending/${TASK_ID}.md"
|
||||
ASSIGNED_FILE="management/tasks/assigned/${TASK_ID}.md"
|
||||
AGENT_FILE="management/agents/${AGENT}/${TASK_ID}.task"
|
||||
|
||||
# 检查任务文件是否存在
|
||||
if [ ! -f "$PENDING_FILE" ]; then
|
||||
echo "❌ 错误:任务文件不存在 $PENDING_FILE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 确保Agent目录存在
|
||||
mkdir -p "management/agents/${AGENT}"
|
||||
mkdir -p management/tasks/assigned
|
||||
@@ -28,13 +34,28 @@ sed -i '' "s/# 负责人:.*/# 负责人: $AGENT/" "$ASSIGNED_FILE"
|
||||
# 创建.task文件通知Agent
|
||||
cp "$PENDING_FILE" "$AGENT_FILE"
|
||||
|
||||
# 简单直接处理:pull,add,commit,push
|
||||
git pull --rebase origin main > /dev/null 2>&1
|
||||
git add "$PENDING_FILE" "$ASSIGNED_FILE" "$AGENT_FILE" > /dev/null 2>&1
|
||||
git commit -m "feat: 分配任务 $TASK_ID 给 $AGENT" > /dev/null 2>&1
|
||||
git push origin main > /dev/null 2>&1
|
||||
# Git处理,带容错
|
||||
echo "🔄 正在拉取最新代码..."
|
||||
git pull --rebase origin main
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git pull 失败,请先解决冲突后再试"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git add "$PENDING_FILE" "$ASSIGNED_FILE" "$AGENT_FILE"
|
||||
git commit -m "feat: 分配任务 $TASK_ID 给 $AGENT"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git commit 失败"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git push origin main
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git push 失败"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ 任务已分配给 $AGENT"
|
||||
echo "📄 任务文件: $ASSIGNED_FILE"
|
||||
echo "📬 通知文件: $AGENT_FILE"
|
||||
echo "🌐 已推送到 Gitee"
|
||||
echo "🌐 已推送到 Gitee"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# 创建新任务脚本 - 彻底修复,简单直接方案
|
||||
# 创建新任务脚本 - 带git容错处理
|
||||
|
||||
TASK_ID="TASK-$(date +%Y%m%d%H%M%S)"
|
||||
TASK_FILE="management/tasks/pending/${TASK_ID}.md"
|
||||
@@ -12,11 +12,26 @@ echo "" >> "$TASK_FILE"
|
||||
echo "## 任务需求" >> "$TASK_FILE"
|
||||
echo "$1" >> "$TASK_FILE"
|
||||
|
||||
# 简单直接处理:pull,add,commit,push
|
||||
git pull --rebase origin main > /dev/null 2>&1
|
||||
git add "$TASK_FILE" > /dev/null 2>&1
|
||||
git commit -m "feat: 创建新任务 $TASK_ID" > /dev/null 2>&1
|
||||
git push origin main > /dev/null 2>&1
|
||||
# Git处理,带容错
|
||||
echo "🔄 正在拉取最新代码..."
|
||||
git pull --rebase origin main
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git pull 失败,请先解决冲突后再试"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git add "$TASK_FILE"
|
||||
git commit -m "feat: 创建新任务 $TASK_ID"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git commit 失败"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git push origin main
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git push 失败"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ 任务创建成功: $TASK_ID"
|
||||
echo "📄 文件: $TASK_FILE"
|
||||
|
||||
Reference in New Issue
Block a user