diff --git a/.github/workflows/run_unit_evals.yml b/.github/workflows/run_unit_evals.yml index d4d4529a30e1abfc4be06e7a39640d09f6b06a63..8f64a5c8bcfd07d56279438795f817bfaa1e2e28 100644 --- a/.github/workflows/run_unit_evals.yml +++ b/.github/workflows/run_unit_evals.yml @@ -65,5 +65,5 @@ jobs: rm -rf ./../.cargo shell: bash -euxo pipefail {0} concurrency: - group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }} + group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.run_id }} cancel-in-progress: true diff --git a/tooling/xtask/src/tasks/workflows/run_agent_evals.rs b/tooling/xtask/src/tasks/workflows/run_agent_evals.rs index fd9f696dc9537ec21388dc2a287eb52b6334ce70..ec9b70a2db9049b62676b43d614818374e0930a1 100644 --- a/tooling/xtask/src/tasks/workflows/run_agent_evals.rs +++ b/tooling/xtask/src/tasks/workflows/run_agent_evals.rs @@ -41,7 +41,7 @@ pub(crate) fn run_unit_evals() -> Workflow { .add_input(model_name.name, model_name.input()) .add_input(commit_sha.name, commit_sha.input()), )) - .concurrency(vars::one_workflow_per_non_main_branch()) + .concurrency(vars::allow_concurrent_runs()) .add_env(("CARGO_TERM_COLOR", "always")) .add_env(("CARGO_INCREMENTAL", 0)) .add_env(("RUST_BACKTRACE", 1)) diff --git a/tooling/xtask/src/tasks/workflows/vars.rs b/tooling/xtask/src/tasks/workflows/vars.rs index 6493bd0ab62699454af6c100d526143c54f8774f..e5cc3bc222fab974412f294439648c0d23da50eb 100644 --- a/tooling/xtask/src/tasks/workflows/vars.rs +++ b/tooling/xtask/src/tasks/workflows/vars.rs @@ -81,6 +81,12 @@ pub(crate) fn one_workflow_per_non_main_branch() -> Concurrency { .cancel_in_progress(true) } +pub(crate) fn allow_concurrent_runs() -> Concurrency { + Concurrency::default() + .group("${{ github.workflow }}-${{ github.ref_name }}-${{ github.run_id }}") + .cancel_in_progress(true) +} + // Represents a pattern to check for changed files and corresponding output variable pub(crate) struct PathCondition { pub name: &'static str,