Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Work around flaky create_dist_zips on macOS (#25576)" #25631

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Revert "Work around flaky create_dist_zips on macOS (#25576)" #25631

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb4e77c
Revert "Work around flaky create_dist_zips on macOS (#25576)"
mherrmann Sep 18, 2024
03bd447
Lint
mherrmann Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions script/create-dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/.
Expand Down Expand Up @@ -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:
Expand Down
Loading