From 8775504ff52c06ea67041bac24314dce8b2e6da6 Mon Sep 17 00:00:00 2001 From: Federica Date: Thu, 30 May 2024 16:29:48 -0300 Subject: [PATCH 1/2] Add concurrency to ci workflow --- .github/workflows/bench-hyperfine.yml | 5 ----- .github/workflows/ci.yml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bench-hyperfine.yml b/.github/workflows/bench-hyperfine.yml index 7d4fca2b0..6eb84df05 100644 --- a/.github/workflows/bench-hyperfine.yml +++ b/.github/workflows/bench-hyperfine.yml @@ -6,11 +6,6 @@ on: merge_group: types: [checks_requested] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32b95e303..030067b6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,10 @@ on: merge_group: types: [checks_requested] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + jobs: check: name: clippy From 366b900b35f92ab95cf8880c1bfba517199afcf4 Mon Sep 17 00:00:00 2001 From: Federica Date: Thu, 30 May 2024 16:35:54 -0300 Subject: [PATCH 2/2] Revert change --- .github/workflows/bench-hyperfine.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/bench-hyperfine.yml b/.github/workflows/bench-hyperfine.yml index 6eb84df05..7d4fca2b0 100644 --- a/.github/workflows/bench-hyperfine.yml +++ b/.github/workflows/bench-hyperfine.yml @@ -6,6 +6,11 @@ on: merge_group: types: [checks_requested] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: CARGO_TERM_COLOR: always