Skip to content

Commit 196ec71

Browse files
authored
Prevent canceling in progress jobs on release (#462)
1 parent 0834297 commit 196ec71

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${ github.event_name }-${{ github.event.pull_request.number || github.sha }}
20-
cancel-in-progress: true
20+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2121

2222
permissions:
2323
checks: read

tests/integration/test_container.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def test_nav_collections(
216216
f"ansible-navigator collections --lf {tmp_path}/navigator.log"
217217
f" --pp never --eei {infrastructure.navigator_ee}"
218218
)
219-
stdout = container_tmux.send_and_wait(cmd=cmd, wait_for=":help help", timeout=15)
219+
stdout = container_tmux.send_and_wait(cmd=cmd, wait_for=":help help", timeout=30)
220220
assert any("ansible.builtin" in line for line in stdout)
221221
assert any("ansible.posix" in line for line in stdout)
222222
cmd = ":0"

0 commit comments

Comments
 (0)