Merge pull request #67 from vector-im/t3chguy/ia32

Consolidate target handling with element-desktop

Author: t3chguy

package.json

@@ -11,7 +11,8 @@
     "build": "tsc"
   },
   "dependencies": {
-    "rimraf": "^3.0.2"
+    "rimraf": "^3.0.2",
+    "element-desktop": "vector-im/element-desktop#develop"
   },
   "devDependencies": {
     "@types/node": "14",

src/desktop_develop.ts

@@ -16,14 +16,14 @@ limitations under the License.
 
 import { promises as fsProm } from 'fs';
 import * as path from 'path';
+import { Target, TargetId, UniversalTarget, WindowsTarget } from 'element-desktop/scripts/hak/target';
 
 import getSecret from './get_secret';
 import GitRepo from './gitrepo';
 import rootLogger, { LoggableError, Logger } from './logger';
 import Runner, { IRunner } from './runner';
 import DockerRunner from './docker_runner';
 import WindowsBuilder from './windows_builder';
-import { ENABLED_TARGETS, Target, TargetId, UniversalTarget, WindowsTarget } from './target';
 import { setDebVersion, addDeb } from './debian';
 import { getMatchingFilesInDir, pushArtifacts, copyAndLog, rm } from './artifacts';
 
@@ -99,6 +99,7 @@ export default class DesktopDevelopBuilder {
     private lastFailTimes: Partial<Record<TargetId, number>> = {};
 
     constructor(
+        private readonly targets: Target[],
         private winVmName: string,
         private winUsername: string,
         private winPassword: string,
@@ -122,7 +123,7 @@ export default class DesktopDevelopBuilder {
 
         this.lastBuildTimes = {};
         this.lastFailTimes = {};
-        for (const target of ENABLED_TARGETS) {
+        for (const target of this.targets) {
             this.lastBuildTimes[target.id] = await getLastBuildTime(target, logger);
             this.lastFailTimes[target.id] = 0;
         }
@@ -135,7 +136,7 @@ export default class DesktopDevelopBuilder {
         if (this.building) return;
 
         const toBuild: Target[] = [];
-        for (const target of ENABLED_TARGETS) {
+        for (const target of this.targets) {
             const nextBuildDue = getNextBuildTime(new Date(Math.max(
                 this.lastBuildTimes[target.id], this.lastFailTimes[target.id],
             )));

src/desktop_release.ts

@@ -16,14 +16,14 @@ limitations under the License.
 
 import { promises as fsProm } from 'fs';
 import * as path from 'path';
+import { Target, UniversalTarget, WindowsTarget } from 'element-desktop/scripts/hak/target';
 
 import getSecret from './get_secret';
 import GitRepo from './gitrepo';
 import rootLogger, { LoggableError, Logger } from './logger';
 import Runner, { IRunner } from './runner';
 import DockerRunner from './docker_runner';
 import WindowsBuilder from './windows_builder';
-import { ENABLED_TARGETS, Target, UniversalTarget, WindowsTarget } from './target';
 import { setDebVersion, addDeb } from './debian';
 import { getMatchingFilesInDir, pushArtifacts, copyAndLog, rm } from './artifacts';
 
@@ -41,6 +41,7 @@ export default class DesktopReleaseBuilder {
     private riotSigningKeyContainer: string;
 
     constructor(
+        private readonly targets: Target[],
         private winVmName: string,
         private winUsername: string,
         private winPassword: string,
@@ -82,8 +83,7 @@ export default class DesktopReleaseBuilder {
 
         if (this.building) return;
 
-        const toBuild = ENABLED_TARGETS;
-
+        const toBuild = this.targets;
         if (toBuild.length === 0) return;
 
         try {

src/index.ts

@@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { Target, TARGETS } from 'element-desktop/scripts/hak/target';
+
 import logger from './logger';
 import DesktopDevelopBuilder from './desktop_develop';
 import DesktopReleaseBuilder from './desktop_release';
@@ -67,12 +69,19 @@ while (process.argv.length > 2) {
     process.argv.shift();
 }
 
+// The set of targets we build by default, sorted by increasing complexity so
+// that we fail fast when the native host target fails.
+const targets: Target[] = [
+    TARGETS['universal-apple-darwin'],
+    TARGETS['x86_64-unknown-linux-gnu'],
+    TARGETS['x86_64-pc-windows-msvc'],
+    TARGETS['i686-pc-windows-msvc'],
+];
+
 let builder: DesktopDevelopBuilder | DesktopReleaseBuilder;
 if (desktopBranch) {
-    builder = new DesktopReleaseBuilder(
-        winVmName, winUsername, winPassword, rsyncServer, desktopBranch);
+    builder = new DesktopReleaseBuilder(targets, winVmName, winUsername, winPassword, rsyncServer, desktopBranch);
 } else {
-    builder = new DesktopDevelopBuilder(
-        winVmName, winUsername, winPassword, rsyncServer);
+    builder = new DesktopDevelopBuilder(targets, winVmName, winUsername, winPassword, rsyncServer);
 }
 builder.start();

src/spawn.ts

@@ -22,25 +22,29 @@ export async function spawn(
     command: string,
     args: ReadonlyArray<string>,
     options: childProcess.SpawnOptions = {},
+    captureLog = true,
 ): Promise<void> {
     return new Promise((resolve, reject) => {
         const proc = childProcess.spawn(command, args, {
             ...options,
-            stdio: ["inherit", "pipe", "pipe"],
+            stdio: captureLog ? ["inherit", "pipe", "pipe"] : "inherit",
         });
 
-        proc.stdout.pipe(process.stdout);
-        proc.stderr.pipe(process.stderr);
-
         let log = "";
-        proc.stdout.on('data', (chunk) => {
-            log += chunk.toString();
-        });
-        proc.stderr.on('data', (chunk) => {
-            log += chunk.toString();
-        });
 
-        proc.on('exit', (code) => {
+        if (captureLog) {
+            proc.stdout.pipe(process.stdout);
+            proc.stderr.pipe(process.stderr);
+
+            proc.stdout.on('data', (chunk) => {
+                log += chunk.toString();
+            });
+            proc.stderr.on('data', (chunk) => {
+                log += chunk.toString();
+            });
+        }
+
+        proc.on('exit', (code?: number) => {
             if (!code) {
                 resolve();
                 return;

src/target.ts

@@ -17,8 +17,8 @@ limitations under the License.
 import * as path from 'path';
 import { promises as fsProm } from 'fs';
 import * as childProcess from 'child_process';
+import { WindowsTarget } from 'element-desktop/scripts/hak/target';
 
-import { WindowsTarget } from './target';
 import { Logger } from "./logger";
 import { spawn } from "./spawn";
 
@@ -228,7 +228,7 @@ export default class WindowsBuilder {
     }
 
     private async vboxManage(cmd: string, ...args: string[]): Promise<void> {
-        return spawn('VBoxManage', [cmd].concat(args));
+        return spawn('VBoxManage', [cmd].concat(args), {}, false);
     }
 
     public static async setDonglePower(on: boolean): Promise<void> {

src/windows_builder.ts

@@ -7,5 +7,6 @@
     "include": [
         ".eslintrc.js",
         "./src/**/*.ts",
+        "./node_modules/element-desktop/scripts/hak/target.ts"
     ]
 }