Skip to content

fix: Use DEFAULT_EXECUTE_TIMEOUT for swift package actions #1002

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
merged 1 commit into from
May 13, 2025
Merged

fix: Use DEFAULT_EXECUTE_TIMEOUT for swift package actions #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def build_swift_package(path, swiftc, swift_version, configuration,
if added_swift_flags is not None:
for flag in added_swift_flags.split():
command += ["-Xswiftc", flag]
return common.check_execute(command, timeout=3600,
return common.check_execute(command, timeout=common.DEFAULT_EXECUTE_TIMEOUT,
sandbox_profile=sandbox_profile,
stdout=stdout, stderr=stderr,
env=env)
Expand All @@ -377,7 +377,7 @@ def test_swift_package(path, swiftc, sandbox_profile,
if (swift_branch not in ['swift-3.0-branch',
'swift-3.1-branch']):
command.insert(2, '--disable-sandbox')
return common.check_execute(command, timeout=3600,
return common.check_execute(command, timeout=common.DEFAULT_EXECUTE_TIMEOUT,
sandbox_profile=sandbox_profile,
stdout=stdout, stderr=stderr,
env=env)
Expand Down
2 changes: 1 addition & 1 deletion project_precommit_check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def check(project, swift_branch, swiftc, compatibility_version):
]
common.debug_print("--- Executing build actions ---")
try:
common.check_execute(runner_command, timeout=3600)
common.check_execute(runner_command, timeout=common.DEFAULT_EXECUTE_TIMEOUT)
except common.ExecuteCommandFailure:
common.debug_print("--- Encountered failures. Check .log files in current directory for details ---")
return 1
Expand Down
2 changes: 1 addition & 1 deletion reproduce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def main():
run_command += ['--skip-clone']
if args.assertions:
run_command += ['--assertions']
common.check_execute(run_command, timeout=3600)
common.check_execute(run_command, timeout=common.DEFAULT_EXECUTE_TIMEOUT)

# Build specified indexed project. Otherwise, build all indexed projects
runner_command = [
Expand Down