From 9a5b904db32d57e56ed1ea458962a3fbf8c02b2f Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Wed, 8 Jan 2025 17:02:49 +0800 Subject: [PATCH] ci: do not trigger tests when there is a merge conflict (#5318) * ci: do not trigger tests when there is a merge conflict * Update .github/workflows/develop.yml Co-authored-by: Lei, HUANG <6406592+v0y4g3r@users.noreply.github.com> * ci: disable cache from rust toolchain action --------- Co-authored-by: Lei, HUANG <6406592+v0y4g3r@users.noreply.github.com> --- .github/workflows/develop.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index c8f8c681b2..a5e7ee57cd 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -638,11 +638,19 @@ jobs: - name: Run cargo clippy run: make clippy + conflict-check: + name: Check for conflict + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Merge Conflict Finder + uses: olivernybroe/action-conflict-finder@v4.0 + coverage: if: github.event.pull_request.draft == false runs-on: ubuntu-20.04-8-cores timeout-minutes: 60 - needs: [clippy, fmt] + needs: [conflict-check, clippy, fmt] steps: - uses: actions/checkout@v4 - uses: arduino/setup-protoc@v3 @@ -655,6 +663,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1 with: components: llvm-tools-preview + cache: false # - name: Rust Cache # uses: Swatinem/rust-cache@v2 # with: