From 94c2a7671ca07e74d36d621d046c0f2f6d2f04f3 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Fri, 8 Apr 2022 07:17:51 -0400 Subject: [PATCH] build: temporarily disable 32-bit Windows symbol generation (#33653) * build: temporarily disable 32-bit Windows symbol generation * fix: modify upload.py * chore: fix comment Co-authored-by: VerteDinde --- appveyor.yml | 5 +++-- script/release/release.js | 3 ++- script/release/uploaders/upload.py | 14 ++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 55bdb38d5d86..8839a999a965 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -174,14 +174,15 @@ build_script: - python %LOCAL_GOMA_DIR%\goma_ctl.py stat - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json - 7z a node_headers.zip out\Default\gen\node_headers + # Temporarily disable symbol generation on 32-bit Windows due to failures - ps: >- - if ($env:GN_CONFIG -eq 'release') { + if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') { # Needed for msdia140.dll on 64-bit windows $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin" ninja -C out/Default electron:electron_symbols } - ps: >- - if ($env:GN_CONFIG -eq 'release') { + if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') { python electron\script\zip-symbols.py appveyor-retry appveyor PushArtifact out/Default/symbols.zip } else { diff --git a/script/release/release.js b/script/release/release.js index 21ebbc0836ae..97873ec38c37 100755 --- a/script/release/release.js +++ b/script/release/release.js @@ -134,7 +134,8 @@ function assetsForVersion (version, validatingRelease) { `electron-${version}-mas-arm64-symbols.zip`, `electron-${version}-mas-arm64.zip`, `electron-${version}-win32-ia32-pdb.zip`, - `electron-${version}-win32-ia32-symbols.zip`, + // TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures + // `electron-${version}-win32-ia32-symbols.zip`, `electron-${version}-win32-ia32.zip`, `electron-${version}-win32-x64-pdb.zip`, `electron-${version}-win32-x64-symbols.zip`, diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py index 014d7c53749b..c3f860603624 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -76,9 +76,10 @@ def main(): shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip) upload_electron(release, electron_zip, args) if get_target_arch() != 'mips64el': - symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) - shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) - upload_electron(release, symbols_zip, args) + if get_target_arch() != 'ia32' and PLATFORM != 'win32': + symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) + shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) + upload_electron(release, symbols_zip, args) if PLATFORM == 'darwin': if get_platform_key() == 'darwin' and get_target_arch() == 'x64': api_path = os.path.join(ELECTRON_DIR, 'electron-api.json') @@ -95,9 +96,10 @@ def main(): shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip) upload_electron(release, dsym_snaphot_zip, args) elif PLATFORM == 'win32': - pdb_zip = os.path.join(OUT_DIR, PDB_NAME) - shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip) - upload_electron(release, pdb_zip, args) + if get_target_arch() != 'ia32': + pdb_zip = os.path.join(OUT_DIR, PDB_NAME) + shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip) + upload_electron(release, pdb_zip, args) elif PLATFORM == 'linux': debug_zip = os.path.join(OUT_DIR, DEBUG_NAME) shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)