From adcddc31a3d89a4c7131f898f3071ab43229bf51 Mon Sep 17 00:00:00 2001 From: Charliechen114514 <725610365@qq.com> Date: Fri, 26 Jun 2026 09:55:50 +0800 Subject: [PATCH] ci: retire develop branch; switch to trunk-based workflow - cpp-check/docs-check/docker-build-env: drop develop from triggers - cpp-check: simplify CI scope to always-full matrix (GCC+Clang+MSVC); all PRs now target main, so the develop/label-gated Clang/MSVC opt-in is removed - cpp-check: add push:[main] trigger so main stays verified and seeds build/ccache caches for PRs (avoids per-PR cold-start) develop's history is preserved in main via the PR #7 merge commit (adcfaa08d); the develop branch itself is removed next. --- .github/workflows/cpp-check.yml | 31 +++++++------------------- .github/workflows/docker-build-env.yml | 1 - .github/workflows/docs-check.yml | 2 +- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/.github/workflows/cpp-check.yml b/.github/workflows/cpp-check.yml index c4b5d665a..84f84499a 100644 --- a/.github/workflows/cpp-check.yml +++ b/.github/workflows/cpp-check.yml @@ -5,12 +5,14 @@ on: branches: - main - release/* - - develop types: - opened - synchronize - reopened - labeled + push: + branches: + - main workflow_dispatch: permissions: @@ -32,31 +34,14 @@ jobs: - name: Determine CI scope id: check run: | - BASE="${{ github.base_ref }}" - LABELS="${{ join(github.event.pull_request.labels.*.name, ',') }}" - + # Trunk-based: full matrix (GCC + Clang + MSVC) on every PR / push to main. echo "should_run=true" >> "$GITHUB_OUTPUT" - - # Clang: build-clang label or main/release (always full) - if echo "$LABELS" | grep -qw "build-clang" || [[ "$BASE" != "develop" ]]; then - echo "run_clang=true" >> "$GITHUB_OUTPUT" - else - echo "run_clang=false" >> "$GITHUB_OUTPUT" - fi - - # MSVC: build-msvc label or main/release (always full) - if echo "$LABELS" | grep -qw "build-msvc" || [[ "$BASE" != "develop" ]]; then - echo "run_msvc=true" >> "$GITHUB_OUTPUT" - else - echo "run_msvc=false" >> "$GITHUB_OUTPUT" - fi + echo "run_clang=true" >> "$GITHUB_OUTPUT" + echo "run_msvc=true" >> "$GITHUB_OUTPUT" echo "--- CI Scope ---" - echo "Base branch: $BASE" - echo "Labels: $LABELS" - echo "GCC: always" - echo "Clang: $(echo "$LABELS" | grep -qE 'build-(clang|all-platform)' && echo 'yes' || { [[ "$BASE" != "develop" ]] && echo 'yes' || echo 'no'; })" - echo "MSVC: $(echo "$LABELS" | grep -qE 'build-(msvc|all-platform)' && echo 'yes' || { [[ "$BASE" != "develop" ]] && echo 'yes' || echo 'no'; })" + echo "Event: ${{ github.event_name }} ref: ${{ github.ref_name }}" + echo "Matrix: GCC + Clang + MSVC (full)" linux-gcc: name: Linux GCC diff --git a/.github/workflows/docker-build-env.yml b/.github/workflows/docker-build-env.yml index 44675b470..801b2b7c6 100644 --- a/.github/workflows/docker-build-env.yml +++ b/.github/workflows/docker-build-env.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - develop paths: - .github/workflows/docker-build-env.yml - scripts/docker/Dockerfile.build diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 0fbf0b512..00d3f9efc 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -3,7 +3,7 @@ name: Docs Check on: pull_request: branches: - - develop + - main types: - opened - synchronize