From 8f728af13ae8a8481ba1ada6679c507895913a67 Mon Sep 17 00:00:00 2001 From: Robo Date: Wed, 11 Dec 2019 23:27:17 -0800 Subject: [PATCH] fix: avoid Electron.dsym files in the main app bundle (#21447) (#21487) * ci: CHECK_DIST_MANIFEST in release builds * fix: skip Electron.dSYM on macOS app zip --- .circleci/config.yml | 1 + build/zip.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a76404756f74..e3dc9396d3666 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,6 +41,7 @@ env-release-build: &env-release-build GN_CONFIG: //electron/build/args/release.gn STRIP_BINARIES: true GENERATE_SYMBOLS: true + CHECK_DIST_MANIFEST: '1' env-headless-testing: &env-headless-testing DISPLAY: ':99.0' diff --git a/build/zip.py b/build/zip.py index ff9c888d9143c..97ef8b6abfab7 100644 --- a/build/zip.py +++ b/build/zip.py @@ -16,6 +16,10 @@ './libVkICD_mock_', #Skipping because these are outputs that we don't need './VkICD_mock_', #Skipping because these are outputs that we don't need + # Skipping because its an output of create_bundle from //build/config/mac/rules.gni + # that we don't need + 'Electron.dSYM', + # //chrome/browser:resources depends on this via # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to # ship it. @@ -51,14 +55,13 @@ def main(argv): with open(runtime_deps) as f: for dep in f.readlines(): dep = dep.strip() - dist_files.add(dep) + if not skip_path(dep, dist_zip, target_cpu): + dist_files.add(dep) if sys.platform == 'darwin': execute(['zip', '-r', '-y', dist_zip] + list(dist_files)) else: with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z: for dep in dist_files: - if skip_path(dep, dist_zip, target_cpu): - continue if os.path.isdir(dep): for root, dirs, files in os.walk(dep): for file in files: