diff --git a/.copier-answers.ci.yml b/.copier-answers.ci.yml index e613bbb9..9a3284e0 100644 --- a/.copier-answers.ci.yml +++ b/.copier-answers.ci.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: f2c3332 +_commit: 467877a _src_path: gh:athackst/ci automerge_mode: poll bump_script_path: '' diff --git a/.github/workflows/pr_automerge.yml b/.github/workflows/pr_automerge.yml index 9c765b42..46b1bbd0 100644 --- a/.github/workflows/pr_automerge.yml +++ b/.github/workflows/pr_automerge.yml @@ -11,7 +11,7 @@ on: concurrency: group: "pr-automerge-${{ github.event.pull_request.number || github.ref }}" - cancel-in-progress: true + cancel-in-progress: false jobs: pr-automerge: