Skip to content

Commit 6250101

Browse files
authored
fix: Use DEFAULT_EXECUTE_TIMEOUT for swiftpm build and test actions (#1002)
These timeouts were hardcoded instead of using the argument value, which prevented the argument from having an effect.
1 parent 180a35e commit 6250101

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

project.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def build_swift_package(path, swiftc, swift_version, configuration,
352352
if added_swift_flags is not None:
353353
for flag in added_swift_flags.split():
354354
command += ["-Xswiftc", flag]
355-
return common.check_execute(command, timeout=3600,
355+
return common.check_execute(command, timeout=common.DEFAULT_EXECUTE_TIMEOUT,
356356
sandbox_profile=sandbox_profile,
357357
stdout=stdout, stderr=stderr,
358358
env=env)
@@ -377,7 +377,7 @@ def test_swift_package(path, swiftc, sandbox_profile,
377377
if (swift_branch not in ['swift-3.0-branch',
378378
'swift-3.1-branch']):
379379
command.insert(2, '--disable-sandbox')
380-
return common.check_execute(command, timeout=3600,
380+
return common.check_execute(command, timeout=common.DEFAULT_EXECUTE_TIMEOUT,
381381
sandbox_profile=sandbox_profile,
382382
stdout=stdout, stderr=stderr,
383383
env=env)

project_precommit_check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ def check(project, swift_branch, swiftc, compatibility_version):
237237
]
238238
common.debug_print("--- Executing build actions ---")
239239
try:
240-
common.check_execute(runner_command, timeout=3600)
240+
common.check_execute(runner_command, timeout=common.DEFAULT_EXECUTE_TIMEOUT)
241241
except common.ExecuteCommandFailure:
242242
common.debug_print("--- Encountered failures. Check .log files in current directory for details ---")
243243
return 1

reproduce.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def main():
112112
run_command += ['--skip-clone']
113113
if args.assertions:
114114
run_command += ['--assertions']
115-
common.check_execute(run_command, timeout=3600)
115+
common.check_execute(run_command, timeout=common.DEFAULT_EXECUTE_TIMEOUT)
116116

117117
# Build specified indexed project. Otherwise, build all indexed projects
118118
runner_command = [

0 commit comments

Comments
 (0)