fix(maker-squirrel): do not register the delta nupkg as an artifact w…

…hen deltas are disabled (#3059) * Revert "fix(publisher-s3): ensure files are on disk before publishing (#2585)" This reverts commit f3d38e0. * fix: do not add delta package to list if noDelta is specified
electron · Nov 9, 2022 · 5559449 · 5559449
1 parent f3d38e0
commit 5559449
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/maker/squirrel/src/MakerSquirrel.ts b/packages/maker/squirrel/src/MakerSquirrel.ts
@@ -41,7 +41,7 @@ export default class MakerSquirrel extends MakerBase<MakerSquirrelConfig> {
       path.resolve(outPath, `${winstallerConfig.name}-${nupkgVersion}-full.nupkg`),
     ];
     const deltaPath = path.resolve(outPath, `${winstallerConfig.name}-${nupkgVersion}-delta.nupkg`);
-    if (winstallerConfig.remoteReleases || (await fs.pathExists(deltaPath))) {
+    if ((winstallerConfig.remoteReleases && !winstallerConfig.noDelta) || (await fs.pathExists(deltaPath))) {
       artifacts.push(deltaPath);
     }
     const msiPath = path.resolve(outPath, winstallerConfig.setupMsi || `${appName}Setup.msi`);

diff --git a/packages/publisher/s3/src/PublisherS3.ts b/packages/publisher/s3/src/PublisherS3.ts
@@ -30,14 +30,12 @@ export default class PublisherS3 extends PublisherBase<PublisherS3Config> {
 
     for (const makeResult of makeResults) {
       artifacts.push(
-        ...makeResult.artifacts
-          .filter((artifact) => fs.existsSync(artifact))
-          .map((artifact) => ({
-            path: artifact,
-            keyPrefix: this.config.folder || makeResult.packageJSON.version,
-            platform: makeResult.platform,
-            arch: makeResult.arch,
-          }))
+        ...makeResult.artifacts.map((artifact) => ({
+          path: artifact,
+          keyPrefix: this.config.folder || makeResult.packageJSON.version,
+          platform: makeResult.platform,
+          arch: makeResult.arch,
+        }))
       );
     }