Skip to content

Commit 966c6ef

Browse files
committed
Increase GHC bindist install timeout
This bumps the default timeout for installing the GHC bindist to 30 minutes. Because the GHC install is so big (1+ GB) the command can take a while to complete on some systems.
1 parent bfc80f4 commit 966c6ef

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

haskell/ghc_bindist.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ include Makefile""")
201201
# https://source.chromium.org/chromium/chromium/src/+/62848c8d298690e086e49a9832278ff56b6976b5.
202202
environment = {"ZERO_AR_DATE": "1"},
203203
working_directory = unpack_dir,
204+
# use a big timeout because copying GHC is slow (1.5G)
205+
timeout = 30 * 60,
204206
)
205207

206208
if not is_hadrian_dist:

haskell/private/workspace_utils.bzl

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ def execute_or_fail_loudly(
22
repository_ctx,
33
arguments,
44
environment = {},
5-
working_directory = ""):
5+
working_directory = "",
6+
timeout = 600):
67
"""Execute the given command
78
89
Fails if the command does not exit with exit-code 0.
910
1011
Args:
1112
arguments: List, the command line to execute.
13+
timeout: The timeout for the command in seconds (default: 600).
1214
1315
Returns:
1416
exec_result: The output of the command.
@@ -19,6 +21,7 @@ def execute_or_fail_loudly(
1921
environment = environment,
2022
quiet = True,
2123
working_directory = working_directory,
24+
timeout = timeout,
2225
)
2326
if exec_result.return_code != 0:
2427
arguments = [_as_string(x) for x in arguments]

0 commit comments

Comments
 (0)