Merge pull request #175 from atom-ide-community/adjust-compression

atom-community · Sep 18, 2020 · 1ef6c44 · 1ef6c44
2 parents b72c904 + f2f8a1e
commit 1ef6c44
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/script/lib/create-debian-package.js b/script/lib/create-debian-package.js
@@ -200,9 +200,32 @@ module.exports = function(packagedAppPath) {
   );
 
   console.log(`Generating .deb file from ${debianPackageDirPath}`);
-  spawnSync('fakeroot', ['dpkg-deb', '-b', debianPackageDirPath], {
-    stdio: 'inherit'
-  });
+
+  // don't compress by default to speed up build
+  let compressionLevel = 0;
+  let compressionType = 'none';
+  if (process.env.IS_RELEASE_BRANCH || process.env.IS_SIGNED_ZIP_BRANCH) {
+    compressionLevel = 6;
+    compressionType = 'xz';
+  }
+  // use sudo if available to speed up build
+  let sudoCommand = 'fakeroot';
+  if (process.env.CI === true || (process.getuid && process.getuid() === 0)) {
+    sudoCommand = 'sudo';
+  }
+  spawnSync(
+    sudoCommand,
+    [
+      'dpkg-deb',
+      `-Z${compressionType}`,
+      `-z${compressionLevel}`,
+      '-b',
+      debianPackageDirPath
+    ],
+    {
+      stdio: 'inherit'
+    }
+  );
 
   console.log(
     `Copying generated package into "${outputDebianPackageFilePath}"`

diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml
@@ -4,7 +4,7 @@ steps:
   - script: |
       sudo apt-get update
       sudo apt-get install -y wget software-properties-common
-      sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev
+      sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev dpkg
       # clang 9 is included in the image
       sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 10
       sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 10