diff --git a/appveyor.yml b/appveyor.yml index 04cdb20e35447..80ee94d49d314 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -170,19 +170,16 @@ build_script: - python %LOCAL_GOMA_DIR%\goma_ctl.py stat - python3 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' -And $env:TARGET_ARCH -ne 'ia32') { + if ($env:GN_CONFIG -eq 'release') { # 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:TARGET_ARCH -ne 'ia32') { - python electron\script\zip-symbols.py - appveyor-retry appveyor PushArtifact out/Default/symbols.zip - } + python electron\script\zip-symbols.py + appveyor-retry appveyor PushArtifact out/Default/symbols.zip } else { # It's useful to have pdb files when debugging testing builds that are # built on CI. diff --git a/build/extract_symbols.gni b/build/extract_symbols.gni index e3fa2a30f4ca0..2f98aa466ba15 100644 --- a/build/extract_symbols.gni +++ b/build/extract_symbols.gni @@ -24,7 +24,11 @@ template("extract_symbols") { assert(defined(invoker.binary), "Need binary to dump") assert(defined(invoker.symbol_dir), "Need directory for symbol output") - dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)" + if (host_os == "win" && target_cpu == "x86") { + dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)" + } else { + dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)" + } dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") + "/dump_syms$_host_executable_suffix" diff --git a/script/release/release.js b/script/release/release.js index e89d7ba920245..c3c8d6363b120 100755 --- a/script/release/release.js +++ b/script/release/release.js @@ -128,9 +128,8 @@ function assetsForVersion (version, validatingRelease) { `electron-${version}-mas-arm64-dsym-snapshot.zip`, `electron-${version}-mas-arm64-symbols.zip`, `electron-${version}-mas-arm64.zip`, - // TODO(vertedinde) Symbol generation on 32-bit Windows is temporarily disabled due to CI failures - // `electron-${version}-win32-ia32-pdb.zip`, - // `electron-${version}-win32-ia32-symbols.zip`, + `electron-${version}-win32-ia32-pdb.zip`, + `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 caaa726d55d8a..5845b88ede1b4 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -76,10 +76,9 @@ def main(): shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip) upload_electron(release, electron_zip, args) if get_target_arch() != 'mips64el': - if (get_target_arch() != 'ia32' or 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) + 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') @@ -96,10 +95,9 @@ def main(): shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip) upload_electron(release, dsym_snapshot_zip, args) elif PLATFORM == 'win32': - 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) + 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)