Skip to content

Commit

Permalink
Merge pull request #2256 from nmattia/nm-bump-timeout
Browse files Browse the repository at this point in the history
Increase GHC bindist install timeout
  • Loading branch information
mergify[bot] authored Nov 7, 2024
2 parents bfc80f4 + 966c6ef commit d401e24
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions haskell/ghc_bindist.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ include Makefile""")
# https://source.chromium.org/chromium/chromium/src/+/62848c8d298690e086e49a9832278ff56b6976b5.
environment = {"ZERO_AR_DATE": "1"},
working_directory = unpack_dir,
# use a big timeout because copying GHC is slow (1.5G)
timeout = 30 * 60,
)

if not is_hadrian_dist:
Expand Down
5 changes: 4 additions & 1 deletion haskell/private/workspace_utils.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ def execute_or_fail_loudly(
repository_ctx,
arguments,
environment = {},
working_directory = ""):
working_directory = "",
timeout = 600):
"""Execute the given command
Fails if the command does not exit with exit-code 0.
Args:
arguments: List, the command line to execute.
timeout: The timeout for the command in seconds (default: 600).
Returns:
exec_result: The output of the command.
Expand All @@ -19,6 +21,7 @@ def execute_or_fail_loudly(
environment = environment,
quiet = True,
working_directory = working_directory,
timeout = timeout,
)
if exec_result.return_code != 0:
arguments = [_as_string(x) for x in arguments]
Expand Down

0 comments on commit d401e24

Please sign in to comment.