From 4a4121c74d9b02f77b189b72ea18f0ee01d219ad Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 16 Sep 2026 23:33:24 +0800 Subject: [PATCH] ci: drop dead references to the deleted release branch (#7945) --- .github/workflows/ci.yml | 9 ++++----- .github/workflows/windows-filesystem.yml | 4 ++-- scripts/ci_gate.py | 4 ++-- scripts/run_scanner_heal_linux_evidence_plan.py | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e90ffbb42..78129e1b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ name: Continuous Integration on: push: - branches: [ main, release ] + branches: [ main ] paths-ignore: - "**.md" - "docs/**" @@ -36,7 +36,7 @@ on: - "flake.lock" pull_request: types: [ opened, synchronize, reopened, closed ] - branches: [ main, release ] + branches: [ main ] merge_group: types: [ checks_requested ] schedule: @@ -867,14 +867,13 @@ jobs: # Merge gate only (backlog#1149 ci-5): the never-automated user-visible # suites — KMS, object_lock, multipart_auth, quota, checksum, encryption, # security-boundary, ... — via the e2e-full nextest profile. Too heavy for - # every PR, so it is gated to main/release pushes, the merge queue, and manual + # every PR, so it is gated to main pushes, the merge queue, and manual # dispatch. protocols / the 7 cluster suites / replication / #[ignore] are # owned by other lanes (see .config/nextest.toml profile.e2e-full). if: >- github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group' || - (github.event_name == 'push' && - (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release')) + (github.event_name == 'push' && github.ref == 'refs/heads/main') needs: [ build-rustfs-debug-binary ] runs-on: sm-standard-2 timeout-minutes: 55 diff --git a/.github/workflows/windows-filesystem.yml b/.github/workflows/windows-filesystem.yml index 918e3f99a..c47e7bc54 100644 --- a/.github/workflows/windows-filesystem.yml +++ b/.github/workflows/windows-filesystem.yml @@ -16,7 +16,7 @@ name: Windows Filesystem Tests on: push: - branches: [ main, release ] + branches: [ main ] paths: - "crates/ecstore/src/disk/**" - "crates/ecstore/src/store/init_format.rs" @@ -26,7 +26,7 @@ on: - ".github/actions/setup/**" - ".github/workflows/windows-filesystem.yml" pull_request: - branches: [ main, release ] + branches: [ main ] paths: - "crates/ecstore/src/disk/**" - "crates/ecstore/src/store/init_format.rs" diff --git a/scripts/ci_gate.py b/scripts/ci_gate.py index e22eeec02..2dc1207f6 100644 --- a/scripts/ci_gate.py +++ b/scripts/ci_gate.py @@ -59,7 +59,7 @@ def expected_results(mode: str, event: str, ref: str) -> dict[str, str]: expected.update({job: "success" if mode == "full" else "skipped" for job in CODE_JOBS}) rio = mode == "full" and event in ("schedule", "workflow_dispatch") expected.update({job: "success" if rio else "skipped" for job in OPTIONAL_JOBS[:2]}) - full = mode == "full" and (event in ("merge_group", "workflow_dispatch") or (event == "push" and ref in ("refs/heads/main", "refs/heads/release"))) + full = mode == "full" and (event in ("merge_group", "workflow_dispatch") or (event == "push" and ref == "refs/heads/main")) expected["e2e-full"] = "success" if full else "skipped" return expected @@ -222,7 +222,7 @@ class SelfTests(unittest.TestCase): def test_full_e2e_gate_preserves_workflow_branch_and_event_scope(self): for event, ref, required in ( ("push", "refs/heads/main", "success"), - ("push", "refs/heads/release", "success"), + ("push", "refs/heads/release", "skipped"), ("push", "refs/heads/feature", "skipped"), ("push", "refs/heads/release-candidate", "skipped"), ("push", "refs/tags/release", "skipped"), diff --git a/scripts/run_scanner_heal_linux_evidence_plan.py b/scripts/run_scanner_heal_linux_evidence_plan.py index f3a2c95d7..01dd48e03 100755 --- a/scripts/run_scanner_heal_linux_evidence_plan.py +++ b/scripts/run_scanner_heal_linux_evidence_plan.py @@ -467,7 +467,7 @@ def build_plan(registry: dict[str, Any], revision: str, phases: set[str]) -> dic "registry": str(REGISTRY.relative_to(ROOT)), "run_root_env": "RUN_ROOT", "requirements": { - "base_branch": "release", + "base_branch": "main", "platform": "Linux", "tracked_source_clean": True, "measured_evidence_required": True,