Merge branch 'main' into UX/connections-ux-tweaks

This commit is contained in:
Lee Jackson 2026-05-15 22:24:49 +01:00 committed by GitHub
commit 6869732e3c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 31 deletions

View file

@ -345,15 +345,13 @@ jobs:
- name: Stop Studio
if: always()
# `set +e` + redirect everything: Git Bash on windows-latest
# has been observed to exit 143 from the kill/sleep block even
# when the upstream test work passed, masking a green run. The
# teardown does not gate correctness, so absorb any signal.
run: |
set +e
kill "${STUDIO_PID}" >/dev/null 2>&1 || true
sleep 2 >/dev/null 2>&1 || true
exit 0
# Run as cmd so we are not running through the Git Bash shell;
# Git Bash on windows-latest has been observed to exit 143
# (SIGTERM) from any inline kill/sleep block, masking a green
# test run. The runner reclaims the Studio child process at
# job end either way, so just emit a marker and exit 0.
shell: cmd
run: echo Stop Studio (no-op; runner reclaims STUDIO_PID=%STUDIO_PID% at job end)
- name: Upload logs
if: always()
@ -768,15 +766,13 @@ jobs:
- name: Stop Studio
if: always()
# `set +e` + redirect everything: Git Bash on windows-latest
# has been observed to exit 143 from the kill/sleep block even
# when the upstream test work passed, masking a green run. The
# teardown does not gate correctness, so absorb any signal.
run: |
set +e
kill "${STUDIO_PID}" >/dev/null 2>&1 || true
sleep 2 >/dev/null 2>&1 || true
exit 0
# Run as cmd so we are not running through the Git Bash shell;
# Git Bash on windows-latest has been observed to exit 143
# (SIGTERM) from any inline kill/sleep block, masking a green
# test run. The runner reclaims the Studio child process at
# job end either way, so just emit a marker and exit 0.
shell: cmd
run: echo Stop Studio (no-op; runner reclaims STUDIO_PID=%STUDIO_PID% at job end)
- name: Upload logs
if: always()
@ -1162,15 +1158,13 @@ jobs:
- name: Stop Studio
if: always()
# `set +e` + redirect everything: Git Bash on windows-latest
# has been observed to exit 143 from the kill/sleep block even
# when the upstream test work passed, masking a green run. The
# teardown does not gate correctness, so absorb any signal.
run: |
set +e
kill "${STUDIO_PID}" >/dev/null 2>&1 || true
sleep 2 >/dev/null 2>&1 || true
exit 0
# Run as cmd so we are not running through the Git Bash shell;
# Git Bash on windows-latest has been observed to exit 143
# (SIGTERM) from any inline kill/sleep block, masking a green
# test run. The runner reclaims the Studio child process at
# job end either way, so just emit a marker and exit 0.
shell: cmd
run: echo Stop Studio (no-op; runner reclaims STUDIO_PID=%STUDIO_PID% at job end)
- name: Upload logs
if: always()

View file

@ -35,9 +35,11 @@ requires_pwsh = pytest.mark.skipif(not PWSH_AVAILABLE, reason = "pwsh not availa
# Helpers
# ---------------------------------------------------------------------------
def run_bash(
script: str, *, timeout: int = 10, env: dict | None = None
script: str, *, timeout: int = 60, env: dict | None = None
) -> subprocess.CompletedProcess:
"""Run a bash script fragment and return the CompletedProcess."""
"""Run a bash script fragment and return the CompletedProcess.
60s default tolerates slow shell startup on heavily-loaded CI
runners; the scripts themselves run in well under a second."""
run_env = os.environ.copy()
if env:
run_env.update(env)
@ -51,9 +53,12 @@ def run_bash(
def run_pwsh(
script: str, *, timeout: int = 10, env: dict | None = None
script: str, *, timeout: int = 60, env: dict | None = None
) -> subprocess.CompletedProcess:
"""Run a PowerShell script fragment and return the CompletedProcess."""
"""Run a PowerShell script fragment and return the CompletedProcess.
60s default tolerates slow pwsh startup on heavily-loaded CI
runners; the scripts themselves run in well under a second.
A 10s budget previously surfaced as a flaky TimeoutExpired."""
run_env = os.environ.copy()
run_env["NO_COLOR"] = "1"
if env: