From 3904ff04b8e7a1a064fbe432f060f3d91f2eee99 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Fri, 20 Jul 2018 16:28:24 -0700 Subject: [PATCH 1/2] Disable delta nupkg generation for Windows nightly releases --- script/lib/create-windows-installer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/script/lib/create-windows-installer.js b/script/lib/create-windows-installer.js index 447d6aa16..e10d90bbf 100644 --- a/script/lib/create-windows-installer.js +++ b/script/lib/create-windows-installer.js @@ -16,6 +16,7 @@ module.exports = (packagedAppPath) => { loadingGif: path.join(CONFIG.repositoryRootPath, 'resources', 'win', 'loading.gif'), outputDirectory: CONFIG.buildOutputPath, noMsi: true, + noDelta: CONFIG.channel === 'nightly', // Delta packages are broken for nightly versions past nightly9 due to Squirrel/NuGet limitations remoteReleases: `https://atom.io/api/updates${archSuffix}?version=${CONFIG.computedAppVersion}`, setupExe: `AtomSetup${process.arch === 'x64' ? '-x64' : ''}.exe`, setupIcon: path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'atom.ico') From 85dfb15e9764bc87ca735ec05b8aa261c9e8729a Mon Sep 17 00:00:00 2001 From: David Wilson Date: Fri, 20 Jul 2018 16:29:01 -0700 Subject: [PATCH 2/2] Use computed version when cleaning up nupkg files in Windows build --- script/lib/create-windows-installer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/create-windows-installer.js b/script/lib/create-windows-installer.js index e10d90bbf..f5e387e7f 100644 --- a/script/lib/create-windows-installer.js +++ b/script/lib/create-windows-installer.js @@ -29,7 +29,7 @@ module.exports = (packagedAppPath) => { } for (let nupkgPath of glob.sync(`${CONFIG.buildOutputPath}/atom-*.nupkg`)) { - if (!nupkgPath.includes(CONFIG.appMetadata.version)) { + if (!nupkgPath.includes(CONFIG.computedAppVersion)) { console.log(`Deleting downloaded nupkg for previous version at ${nupkgPath} to prevent it from being stored as an artifact`) fs.unlinkSync(nupkgPath) } else {