From ccfcd0db8c4eb51effe143a3c31e546da8d3a7c8 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 26 Jan 2026 14:39:05 +0000 Subject: [PATCH 1/2] ci: fix duplicate runs and combine fmt/clippy/test - Remove claude/** from push triggers (PRs handle this) - Add concurrency to cancel in-progress runs - Combine check, fmt, clippy, test into single CI job Reduces number of checks from 7 to 4 and eliminates duplicates. --- .github/workflows/ci.yml | 47 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22b3e50..33d821f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,13 @@ name: CI on: push: - branches: [main, "claude/**"] - pull_request: branches: [main] + pull_request: + +# Cancel in-progress runs for same PR/branch +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true permissions: contents: read @@ -14,47 +18,20 @@ env: RUST_BACKTRACE: 1 jobs: - check: - name: Check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2 - - name: Check - run: cargo check --workspace --all-targets - - fmt: - name: Rustfmt + ci: + name: CI runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - components: rustfmt - - name: Check formatting - run: cargo fmt --all -- --check - - clippy: - name: Clippy - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - components: clippy + components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 + - name: Format + run: cargo fmt --all -- --check - name: Clippy run: cargo clippy --workspace --all-targets -- -D warnings - - test: - name: Test - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2 - - name: Run tests + - name: Test run: cargo test --workspace build: From 0ea4a297bde4f4431a2912309435bd0ee4fc969a Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 27 Jan 2026 00:10:09 +0000 Subject: [PATCH 2/2] ci: rename job to 'Test' for branch protection compatibility --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33d821f..e73a779 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ env: jobs: ci: - name: CI + name: Test runs-on: ubuntu-latest steps: - uses: actions/checkout@v4