From acf76d211a0363810d76201a0eb9419d7f330c02 Mon Sep 17 00:00:00 2001 From: Michael Herrmann Date: Wed, 18 Sep 2024 21:29:41 +0200 Subject: [PATCH] Revert "Work around flaky create_dist_zips on macOS (#25576)" (#25631) This reverts commit ab04e497f0976acb133e001f925c1b266b4513c5. It seems that the other recent "fix" commit did fix the issue. --- script/create-dist.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/script/create-dist.py b/script/create-dist.py index 0c5e2937f25..d4b61afb0a5 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2024 The Brave Authors. All rights reserved. +# Copyright (c) 2018 The Brave Authors. All rights reserved. # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at https://mozilla.org/MPL/2.0/. @@ -45,19 +45,7 @@ def main(): with scoped_cwd(base_dir): if output.endswith('.zip'): - try: - make_zip(output, inputs, dir_inputs) - except RuntimeError as e: - if sys.platform != 'darwin': - raise - # create_dist_zips is currently flaky on macOS. Warn about the - # error but do not fail the build to unblock developers, while - # we determine and resolve the underlying issue. - print('WARNING: ' + e.args[0]) - print(e.args[1]) - # Create the file so CI does not fail because it does not exist: - open(output, 'w').close() - + make_zip(output, inputs, dir_inputs) elif output.endswith('.7z'): make_7z(output, inputs, dir_inputs) else: