From fb4e77c75bea6049b1446e97c9d226606be2ebad Mon Sep 17 00:00:00 2001 From: Michael Herrmann Date: Wed, 18 Sep 2024 15:30:56 +0200 Subject: [PATCH 1/2] Revert "Work around flaky create_dist_zips on macOS (#25576)" This reverts commit ab04e497f0976acb133e001f925c1b266b4513c5. It seems that the other recent "fix" commit did fix the issue. --- script/create-dist.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) mode change 100755 => 100644 script/create-dist.py diff --git a/script/create-dist.py b/script/create-dist.py old mode 100755 new mode 100644 index 0c5e2937f255..3580d147f949 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -1,10 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2024 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/. - import optparse import sys import os @@ -45,19 +40,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: From 03bd447ea07611e05ffd9647fb0c5ff98a2a1839 Mon Sep 17 00:00:00 2001 From: Michael Herrmann Date: Wed, 18 Sep 2024 16:00:27 +0200 Subject: [PATCH 2/2] Lint --- script/create-dist.py | 5 +++++ 1 file changed, 5 insertions(+) mode change 100644 => 100755 script/create-dist.py diff --git a/script/create-dist.py b/script/create-dist.py old mode 100644 new mode 100755 index 3580d147f949..d4b61afb0a55 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -1,5 +1,10 @@ #!/usr/bin/env python +# 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/. + import optparse import sys import os