Skip to content

Fix Windows Helix work item exit code and prerequisite error handling #5075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrewScoggins merged 2 commits into from
Jan 12, 2026
Merged

Fix Windows Helix work item exit code and prerequisite error handling #5075

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
786d8f2
Fix Windows Helix work item exit code and prerequisite error handling
DrewScoggins Jan 7, 2026
ecd14eb
Add set PYTHONPATH as its own line
DrewScoggins Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions scripts/run_performance_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,10 @@ def get_pre_commands(
]

# Clear the PYTHONPATH first so that modules installed elsewhere are not used
# Note: On Windows, 'set PYTHONPATH=' must be a separate command, not chained with &&,
# otherwise Python fails with "OSError: failed to make path absolute"
if os_group == "windows":
install_prerequisites += ["set PYTHONPATH="]
helix_pre_commands += ["set PYTHONPATH="]
else:
install_prerequisites += ["export PYTHONPATH="]

Expand Down Expand Up @@ -207,8 +209,15 @@ def get_pre_commands(

# Add the install_prerequisites to the pre_commands
if os_group == "windows":
# TODO: Should we also give Windows the same treatment as linux and ensure that each command succeeds?
helix_pre_commands += install_prerequisites
# Chain Windows commands with error checking using && to ensure each command succeeds
# If any command fails, set PERF_PREREQS_INSTALL_FAILED and report the error
if install_prerequisites:
combined_prerequisites = " && ".join(install_prerequisites)
helix_pre_commands += [
'echo ** Installing prerequisites **',
f'{combined_prerequisites} || set PERF_PREREQS_INSTALL_FAILED=1',
'if defined PERF_PREREQS_INSTALL_FAILED (echo ** Error: Failed to install prerequisites ** && exit /b 1)'
]
else:
if install_prerequisites:
combined_prequisites = " && ".join(install_prerequisites)
Expand Down Expand Up @@ -272,7 +281,13 @@ def get_post_commands(os_group: str, internal: bool, runtime_type: str):
helix_post_commands = ["export PYTHONPATH=$ORIGPYPATH"]

if internal:
helix_post_commands += ["deactivate"] # deactivate venv
if os_group == "windows":
# Must use 'call' to invoke deactivate.bat, otherwise the batch file
# transfers control to deactivate.bat and never returns, causing the
# EXIT /b %_commandExitCode% at the end of the Helix work item to never run
helix_post_commands += ["call deactivate"]
else:
helix_post_commands += ["deactivate"] # deactivate venv

if runtime_type == "wasm" and os_group != "windows":
helix_post_commands += [
Expand Down
Loading