From ffc9706a85ef91b431934247ca09819ff8a56d56 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Thu, 16 Jul 2026 21:03:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ci):=20=E4=BF=AE=E5=A4=8Dconcurrency=20?= =?UTF-8?q?group=E5=8F=98=E9=87=8F=E5=90=8D=EF=BC=8C=E6=A0=B9=E6=B2=BBrun?= =?UTF-8?q?=E5=A0=86=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #422: 修复concurrency group变量名 - 顶层concurrency group从github.workflow改为硬编码ci-cd前缀 - 使用gitea.event_name和gitea.ref确保跨workflow一致性 - 新push自动取消旧run,根治run堆积问题 --- .gitea/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml index d50dc24d2..a03a4401f 100755 --- a/.gitea/workflows/ci-cd.yml +++ b/.gitea/workflows/ci-cd.yml @@ -30,7 +30,7 @@ on: permissions: contents: read concurrency: - group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }} + group: ci-cd-${{ gitea.event_name }}-${{ gitea.ref }} cancel-in-progress: true jobs: validate: From d9000fee54e1c957112268d636e5b5c04fa2b8c6 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Thu, 16 Jul 2026 21:04:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(ci):=20deploy=20job=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8B=AC=E7=AB=8Bconcurrency=EF=BC=8C=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=8E=92=E9=98=9F=E4=B8=8D=E6=89=93=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #423: deploy job独立concurrency - deploy-staging和deploy-production各加独立concurrency group - cancel-in-progress: false,部署排队不打断 - 全局CI构建仍保持打断模式高效迭代 --- .gitea/workflows/ci-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/ci-build.yml b/.gitea/workflows/ci-build.yml index da5439f8f..1b2772def 100644 --- a/.gitea/workflows/ci-build.yml +++ b/.gitea/workflows/ci-build.yml @@ -159,6 +159,9 @@ jobs: name: Deploy Staging (Watchtower auto-deploy) runs-on: saas timeout-minutes: 15 + concurrency: + group: deploy-staging-${{ gitea.ref }} + cancel-in-progress: false needs: - build-staging if: github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'develop') @@ -594,6 +597,9 @@ jobs: name: Deploy Production runs-on: saas timeout-minutes: 30 + concurrency: + group: deploy-production-${{ gitea.ref }} + cancel-in-progress: false if: startsWith(github.ref, 'refs/tags/v') needs: - build-production