From 86a6f015ba6a73f5712204f1871eaa25e6f66f06 Mon Sep 17 00:00:00 2001 From: Zach Borboa <123986465+zachborboacryptofi@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:21:46 -0400 Subject: [PATCH 1/3] Clarify the existing pending job is canceled --- data/reusables/actions/actions-group-concurrency.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/actions/actions-group-concurrency.md b/data/reusables/actions/actions-group-concurrency.md index 566ff431a616..57941bf7b85b 100644 --- a/data/reusables/actions/actions-group-concurrency.md +++ b/data/reusables/actions/actions-group-concurrency.md @@ -1,4 +1,4 @@ -When a concurrent job or workflow is queued, if another job or workflow using the same concurrency group in the repository is in progress, the queued job or workflow will be `pending`. Any pending job or workflow in the concurrency group will be canceled. This means that there can be at most one running and one pending job in a concurrency group at any time. +When a concurrent job or workflow is queued, if another job or workflow using the same concurrency group in the repository is in progress, the queued job or workflow will be `pending`. Any existing pending job or workflow in the concurrency group will be canceled. This means that there can be at most one running and one pending job in a concurrency group at any time. To also cancel any currently running job or workflow in the same concurrency group, specify `cancel-in-progress: true`. To conditionally cancel currently running jobs or workflows in the same concurrency group, you can specify `cancel-in-progress` as an expression with any of the allowed expression contexts. From 3b4340b3dcf50c19f15a12db063e18513ac45647 Mon Sep 17 00:00:00 2001 From: Zach Borboa <123986465+zachborboacryptofi@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:26:08 -0400 Subject: [PATCH 2/3] Improve wording --- data/reusables/actions/actions-group-concurrency.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/actions/actions-group-concurrency.md b/data/reusables/actions/actions-group-concurrency.md index 57941bf7b85b..bcf112acc0b6 100644 --- a/data/reusables/actions/actions-group-concurrency.md +++ b/data/reusables/actions/actions-group-concurrency.md @@ -1,4 +1,4 @@ -When a concurrent job or workflow is queued, if another job or workflow using the same concurrency group in the repository is in progress, the queued job or workflow will be `pending`. Any existing pending job or workflow in the concurrency group will be canceled. This means that there can be at most one running and one pending job in a concurrency group at any time. +When a concurrent job or workflow is queued, if another job or workflow using the same concurrency group in the repository is in progress, the queued job or workflow will be `pending`. Any pending job or workflow in the same concurrency group, if it exists, will be canceled and the new queued job or workflow will take its place. This means that there can be at most one running and one pending job in a concurrency group at any time. To also cancel any currently running job or workflow in the same concurrency group, specify `cancel-in-progress: true`. To conditionally cancel currently running jobs or workflows in the same concurrency group, you can specify `cancel-in-progress` as an expression with any of the allowed expression contexts. From 0181615c87ba5eb5687ad60778a33a8075f76cfb Mon Sep 17 00:00:00 2001 From: Zach Borboa <123986465+zachborboacryptofi@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:19:26 -0400 Subject: [PATCH 3/3] Address pull request comments --- data/reusables/actions/actions-group-concurrency.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/actions/actions-group-concurrency.md b/data/reusables/actions/actions-group-concurrency.md index bcf112acc0b6..c8fe0461b481 100644 --- a/data/reusables/actions/actions-group-concurrency.md +++ b/data/reusables/actions/actions-group-concurrency.md @@ -1,4 +1,4 @@ -When a concurrent job or workflow is queued, if another job or workflow using the same concurrency group in the repository is in progress, the queued job or workflow will be `pending`. Any pending job or workflow in the same concurrency group, if it exists, will be canceled and the new queued job or workflow will take its place. This means that there can be at most one running and one pending job in a concurrency group at any time. +This means that there can be at most one running and one pending job in a concurrency group at any time. When a concurrent job or workflow is queued, if another job or workflow using the same concurrency group in the repository is in progress, the queued job or workflow will be `pending`. Any existing `pending` job or workflow in the same concurrency group, if it exists, will be canceled and the new queued job or workflow will take its place. To also cancel any currently running job or workflow in the same concurrency group, specify `cancel-in-progress: true`. To conditionally cancel currently running jobs or workflows in the same concurrency group, you can specify `cancel-in-progress` as an expression with any of the allowed expression contexts.