Skip to content

Commit

Permalink
Increase timeouts for macOS toolchain setup
Browse files Browse the repository at this point in the history
This switches all macOS toolchain setup compiles and executes to use the
default timeout of 600s. This should help avoid issues on GitHub actions
where these timeout and cause build failures. The common case shouldn't
really be affected.

bazelbuild/bazel#17437
  • Loading branch information
keith committed Feb 16, 2023
1 parent 8f05e80 commit b0a4fe1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions crosstool/osx_cc_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def _compile_cc_file_single_arch(repository_ctx, src_name, out_name):
"-o",
out_name,
src_name,
], 60)
])
if (xcrun_result.return_code != 0):
error_msg = (
"return code {code}, stderr: {err}, stdout: {out}"
Expand Down Expand Up @@ -100,7 +100,7 @@ def _compile_cc_file(repository_ctx, src_name, out_name):
"-o",
out_name,
src_name,
], 60)
])

if xcrun_result.return_code == 0:
xcrun_result = repository_ctx.execute([
Expand All @@ -113,7 +113,7 @@ def _compile_cc_file(repository_ctx, src_name, out_name):
"--sign",
"-",
out_name,
], 60)
])
if xcrun_result.return_code != 0:
error_msg = (
"codesign return code {code}, stderr: {err}, stdout: {out}"
Expand Down

0 comments on commit b0a4fe1

Please sign in to comment.