Compare commits

...

5 Commits

Author SHA1 Message Date
XiaoXia Bot 3b0ee73f35 test: 空commit测试ci-build调度 2026-07-15 21:37:46 +08:00
xiaoxia 39316b7f22 Merge pull request 'fix(ci): 临时禁用registry cache-to,ACR推送缓存太慢导致构建超时' (#378) from fix/ci-disable-registry-cache-to into develop
CI Build & Deploy Pipeline / Build Staging API Image (push) Blocked by required conditions
CI Build & Deploy Pipeline / Build Staging Web Image (push) Blocked by required conditions
CI Build & Deploy Pipeline / Build Staging Worker Image (push) Blocked by required conditions
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Blocked by required conditions
CI Build & Deploy Pipeline / Staging E2E Tests (push) Blocked by required conditions
CI Build & Deploy Pipeline / Staging API Integration Tests (push) Blocked by required conditions
CI Build & Deploy Pipeline / Build Production API Image (push) Blocked by required conditions
CI Build & Deploy Pipeline / Build Production Web Image (push) Blocked by required conditions
CI Build & Deploy Pipeline / Build Production Worker Image (push) Blocked by required conditions
CI Build & Deploy Pipeline / Deploy Production (push) Blocked by required conditions
CI Build & Deploy Pipeline / Production Browser E2E (push) Blocked by required conditions
CI/CD Pipeline / Frontend Lint (push) Successful in 26s
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 1m45s
CI/CD Pipeline / Unit Tests (push) Successful in 1m50s
CI/CD Pipeline / Integration Tests (push) Successful in 1m18s
2026-07-15 21:25:08 +08:00
XiaoXia Bot f04038f955 fix(ci): 临时禁用registry cache-to,ACR推送缓存太慢导致构建超时\n\nStep 2的registry cache sync在首次全量推送时极慢(API 11min+ / Worker 13min+)\n先注释掉确保全链路跑通,缓存优化后续再调\n\n保留cache-from registry(读缓存),本地缓存读写正常
CI/CD Pipeline / Frontend Lint (push) Successful in 48s
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m31s
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 1m47s
CI/CD Pipeline / Unit Tests (push) Successful in 1m59s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 43s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 1m47s
CI/CD Pipeline / Integration Tests (push) Successful in 1m27s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m24s
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Failing after 1506h3m48s
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Failing after 1506h3m53s
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Failing after 1506h3m55s
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Failing after 1506h5m28s
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Failing after 1506h3m57s
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Failing after 1506h5m29s
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Failing after 1506h5m30s
CI Build & Deploy Pipeline / Production Browser E2E (push) Failing after 1506h5m30s
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Failing after 1506h5m32s
CI Build & Deploy Pipeline / Deploy Production (push) Failing after 1506h5m34s
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Failing after 1506h5m34s
CI Build & Deploy Pipeline / Staging API Integration Tests (push) Failing after 1506h5m39s
CI Build & Deploy Pipeline / Staging E2E Tests (push) Failing after 1506h5m39s
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Failing after 1506h5m40s
CI Build & Deploy Pipeline / Build Production API Image (push) Failing after 1506h5m42s
CI Build & Deploy Pipeline / Build Staging Web Image (push) Failing after 1506h5m44s
CI Build & Deploy Pipeline / Build Staging API Image (push) Failing after 1506h5m44s
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Failing after 1506h37m12s
CI Build & Deploy Pipeline / Deploy Production (pull_request) Failing after 1506h35m35s
CI Build & Deploy Pipeline / Build Production Worker Image (push) Failing after 1506h37m22s
CI Build & Deploy Pipeline / Build Production Web Image (push) Failing after 1506h37m24s
CI Build & Deploy Pipeline / Build Staging Worker Image (push) Failing after 1506h37m28s
2026-07-15 21:24:22 +08:00
xiaoxia 79d6addcef Merge pull request 'fix: 修复生成按钮 PUT 状态限制 + 进度弹窗错误显示' (#377) from fix/generation-put-status-restriction into develop
CI/CD Pipeline / Frontend Lint (push) Successful in 53s
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 1m55s
CI/CD Pipeline / Unit Tests (push) Successful in 2m4s
CI/CD Pipeline / Integration Tests (push) Successful in 1m17s
CI Build & Deploy Pipeline / Build Staging API Image (push) Has been cancelled
CI Build & Deploy Pipeline / Build Staging Web Image (push) Has been cancelled
CI Build & Deploy Pipeline / Build Staging Worker Image (push) Has been cancelled
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Has been cancelled
CI Build & Deploy Pipeline / Staging E2E Tests (push) Has been cancelled
CI Build & Deploy Pipeline / Staging API Integration Tests (push) Has been cancelled
CI Build & Deploy Pipeline / Build Production API Image (push) Has been cancelled
CI Build & Deploy Pipeline / Build Production Web Image (push) Has been cancelled
CI Build & Deploy Pipeline / Build Production Worker Image (push) Has been cancelled
CI Build & Deploy Pipeline / Deploy Production (push) Has been cancelled
CI Build & Deploy Pipeline / Production Browser E2E (push) Has been cancelled
2026-07-15 21:20:36 +08:00
CI Bot 989a8221f2 fix: 修复生成按钮 PUT 状态限制 + 进度弹窗错误显示
CI/CD Pipeline / Frontend Lint (push) Successful in 1m58s
CI/CD Pipeline / Unit Tests (push) Successful in 1m59s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 28s
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m4s
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 2m30s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 1m54s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m30s
CI/CD Pipeline / Integration Tests (push) Successful in 1m27s
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Failing after 1506h9m13s
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Failing after 1506h9m16s
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Failing after 1506h9m16s
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Failing after 1506h11m14s
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Failing after 1506h11m22s
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Failing after 1506h11m15s
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Failing after 1506h11m24s
CI Build & Deploy Pipeline / Production Browser E2E (push) Failing after 1506h11m36s
CI Build & Deploy Pipeline / Build Production Worker Image (push) Failing after 1506h11m40s
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Failing after 1506h11m26s
CI Build & Deploy Pipeline / Build Production Web Image (push) Failing after 1506h11m42s
CI Build & Deploy Pipeline / Staging E2E Tests (push) Failing after 1506h11m43s
CI Build & Deploy Pipeline / Build Production API Image (push) Failing after 1506h11m44s
CI Build & Deploy Pipeline / Build Staging Worker Image (push) Failing after 1506h11m46s
CI Build & Deploy Pipeline / Build Staging Web Image (push) Failing after 1506h11m46s
CI Build & Deploy Pipeline / Build Staging API Image (push) Failing after 1506h11m47s
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Failing after 1506h41m2s
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Failing after 1506h43m1s
CI Build & Deploy Pipeline / Deploy Production (pull_request) Failing after 1506h40m58s
CI Build & Deploy Pipeline / Deploy Production (push) Failing after 1506h43m22s
CI Build & Deploy Pipeline / Staging API Integration Tests (push) Failing after 1506h43m27s
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Failing after 1506h43m29s
- 移除 updateEditPlan 中的 status: 'editing' 参数,避免非 draft 状态被后端拒绝
- 用 try/catch 包裹 updateEditPlan 调用,失败时 warn 并继续执行 generateEditPlan
- 进度弹窗 Modal 的 open 条件增加 !!genError,确保错误信息可见

修复问题:点击'生成视频'按钮无反应(根因:failed 状态计划 PUT 返回 400)
2026-07-15 21:18:06 +08:00
2 changed files with 42 additions and 38 deletions
@@ -955,12 +955,16 @@ const EditingPlanner: React.FC = () => {
let planId = loadedPlanId;
if (planId) {
// 已有计划 → 更新配置
await updateEditPlan(planId, {
config,
total_duration: totalDuration,
status: "editing",
});
// 已有计划 → 更新配置(不传 status,避免非 draft 状态被后端拒绝)
try {
await updateEditPlan(planId, {
config,
total_duration: totalDuration,
});
} catch (updateErr) {
// 非 draft 状态(如 failed/editing)PUT 会被拒绝,忽略继续生成
console.warn("[计划更新跳过]", updateErr);
}
} else {
// 无计划 → 创建新计划
const plan = await createEditPlan({
+32 -32
View File
@@ -54,38 +54,38 @@ echo ""
echo "Image pushed: ${IMAGE_TAG}"
echo "Local cache updated"
echo ""
echo "=== Step 2: Sync registry cache (best effort, retries 3x) ==="
CACHE_TO_REGISTRY="type=registry,ref=${CACHE_REF},mode=max,compression=zstd"
MAX_RETRIES=3
SUCCESS=0
for attempt in $(seq 1 $MAX_RETRIES); do
echo "Registry cache sync attempt $attempt/$MAX_RETRIES"
if docker buildx build \
$BUILD_ARGS \
--cache-from "${CACHE_FROM_LOCAL}" \
--cache-to "${CACHE_TO_REGISTRY}" \
-f "${DOCKERFILE}" \
-t "${IMAGE_TAG}" \
--push \
.; then
echo "Registry cache synced (attempt $attempt)"
SUCCESS=1
break
else
echo "Registry cache sync failed (attempt $attempt)"
if [ $attempt -lt $MAX_RETRIES ]; then
WAIT=$((attempt * 5))
echo "Retrying in ${WAIT}s..."
sleep $WAIT
fi
fi
done
if [ $SUCCESS -eq 0 ]; then
echo "WARNING: Registry cache sync failed after $MAX_RETRIES attempts (non-fatal, local cache still works)"
fi
# DISABLED: registry cache too slow echo ""
# DISABLED: registry cache too slow echo "=== Step 2: Sync registry cache (best effort, retries 3x) ==="
# DISABLED: registry cache too slow CACHE_TO_REGISTRY="type=registry,ref=${CACHE_REF},mode=max,compression=zstd"
# DISABLED: registry cache too slow
# DISABLED: registry cache too slow MAX_RETRIES=3
# DISABLED: registry cache too slow SUCCESS=0
# DISABLED: registry cache too slow for attempt in $(seq 1 $MAX_RETRIES); do
# DISABLED: registry cache too slow echo "Registry cache sync attempt $attempt/$MAX_RETRIES"
# DISABLED: registry cache too slow if docker buildx build \
# DISABLED: registry cache too slow $BUILD_ARGS \
# DISABLED: registry cache too slow --cache-from "${CACHE_FROM_LOCAL}" \
# DISABLED: registry cache too slow --cache-to "${CACHE_TO_REGISTRY}" \
# DISABLED: registry cache too slow -f "${DOCKERFILE}" \
# DISABLED: registry cache too slow -t "${IMAGE_TAG}" \
# DISABLED: registry cache too slow --push \
# DISABLED: registry cache too slow .; then
# DISABLED: registry cache too slow echo "Registry cache synced (attempt $attempt)"
# DISABLED: registry cache too slow SUCCESS=1
# DISABLED: registry cache too slow break
# DISABLED: registry cache too slow else
# DISABLED: registry cache too slow echo "Registry cache sync failed (attempt $attempt)"
# DISABLED: registry cache too slow if [ $attempt -lt $MAX_RETRIES ]; then
# DISABLED: registry cache too slow WAIT=$((attempt * 5))
# DISABLED: registry cache too slow echo "Retrying in ${WAIT}s..."
# DISABLED: registry cache too slow sleep $WAIT
# DISABLED: registry cache too slow fi
# DISABLED: registry cache too slow fi
# DISABLED: registry cache too slow done
# DISABLED: registry cache too slow
# DISABLED: registry cache too slow if [ $SUCCESS -eq 0 ]; then
# DISABLED: registry cache too slow echo "WARNING: Registry cache sync failed after $MAX_RETRIES attempts (non-fatal, local cache still works)"
# DISABLED: registry cache too slow fi
echo ""
echo "Build completed: ${IMAGE_TAG}"