From b3707f1e62beb468e87a65a17b127c1066a87f80 Mon Sep 17 00:00:00 2001 From: cfdaily Date: Thu, 11 Jun 2026 09:58:58 +0800 Subject: [PATCH] revert: remove CI yml changes from lint PR CI yml concurrency changes caused lint step to be skipped. Lint PR should only contain source code formatting fixes. --- .gitea/workflows/ci.yml | 16 +++++----------- .gitea/workflows/deploy.yml | 17 ++++------------- .gitea/workflows/e2e.yml | 13 +++---------- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 466569d..4b98af7 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -5,13 +5,11 @@ # # 注意:只保留 pull_request 触发,避免 push + pull_request 双倍触发 # -# Gitea v1.26.2 已支持: -# - concurrency groups(#32751) -# - 可配置 GITEA_TOKEN 权限(#36173) -# -# 仍不支持: -# - failure() 表达式,用 always() + shell 条件判断替代 -# - continue-on-error / timeout-minutes / permissions +# Gitea v1.23.4 限制注意: +# - 不支持 failure() 表达式,用 always() + shell 条件判断替代 +# - 不支持 concurrency / continue-on-error / timeout-minutes / permissions +# - 无内置 GITEA_TOKEN,需手动配置 PAT 为 secret +# - runs-on 只支持单个 label name: CI @@ -19,10 +17,6 @@ on: pull_request: types: [opened, synchronize] -concurrency: - group: ci-${{ gitea.ref }} - cancel-in-progress: true - jobs: # ── Job 1: Lint ────────────────────────────────────── lint: diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d6a6a42..af91aab 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -3,15 +3,10 @@ # 触发条件: # - push 到 main 分支 # -# Gitea v1.26.2 已支持: -# - concurrency groups(#32751) -# - 可配置 GITEA_TOKEN 权限(#36173) -# -# 仍不支持: -# - failure() 表达式,用 always() + shell 条件判断替代 -# - permissions -# -# 部署脚本 scripts/deploy.sh,支持 --version/--rollback/--health-check +# Gitea v1.23.4 限制注意: +# - 不支持 failure() 表达式 +# - 不支持 concurrency / permissions +# - 部署脚本 scripts/deploy.sh,支持 --version/--rollback/--health-check name: Deploy @@ -19,10 +14,6 @@ on: push: branches: [main] -concurrency: - group: deploy-${{ gitea.ref }} - cancel-in-progress: false - jobs: # ── Job 1: CI(main 分支跑完整测试)───────────────── ci: diff --git a/.gitea/workflows/e2e.yml b/.gitea/workflows/e2e.yml index 80d931d..2751ec9 100644 --- a/.gitea/workflows/e2e.yml +++ b/.gitea/workflows/e2e.yml @@ -9,12 +9,8 @@ # Agent spawn 走生产 openclaw(全局单例,无法隔离), # 测试 case 用 UUID 前缀标识。 # -# Gitea v1.26.2 已支持: -# - concurrency groups -# - workflow_dispatch 触发器(已支持) -# -# 仍不支持: -# - workflow_run 触发器(无法直接 needs 另一个 workflow 的 job) +# Gitea v1.23.4 限制注意: +# - 不支持 workflow_run 触发器(无法直接 needs 另一个 workflow 的 job) # - 此 workflow 需手动触发或在 deploy.yml 中以 needs 方式调用 # - 实际使用时可能需要合并到 deploy.yml 作为同一个 workflow 的 job # - 或依赖 daemon Webhook 监听 deploy 完成事件后通过 API 触发 @@ -23,16 +19,13 @@ name: E2E Tests on: workflow_dispatch: + # 手动触发,可选参数 inputs: test_filter: description: 'Test filter (e.g. tests/e2e/test_api.py)' required: false default: 'tests/e2e/' -concurrency: - group: e2e-${{ gitea.ref }} - cancel-in-progress: true - jobs: e2e: runs-on: ubuntu-latest