From 41c1a7e3185819d31154735e553e2e2cfd3459c6 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Mon, 11 Apr 2022 11:02:01 -0700
Subject: [PATCH] chore: modify uploaded assets for win-ia32 (#33699)

* chore: filter correct symbol files

* chore: upload correct assets
---
 appveyor.yml                       | 8 +++++---
 script/release/release.js          | 2 +-
 script/release/uploaders/upload.py | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8839a999a965..2d364a4057cb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -182,9 +182,11 @@ build_script:
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
-      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
+      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
+        }
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
diff --git a/script/release/release.js b/script/release/release.js
index 97873ec38c37..f43cbf9a0356 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -133,8 +133,8 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
-    `electron-${version}-win32-ia32-pdb.zip`,
     // TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures
+    // `electron-${version}-win32-ia32-pdb.zip`,
     // `electron-${version}-win32-ia32-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index c3f860603624..f255ad50acb0 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -76,7 +76,7 @@ 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' and PLATFORM != 'win32':
+    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)