fix: address further review comments

Author: richard-townsend-arm

build/gulpfile.reh.js

@@ -38,7 +38,6 @@ const BUILD_TARGETS = [
 
 const noop = () => { return Promise.resolve(); };
 
-gulp.task('vscode-reh-win32-arm64-min', noop);
 gulp.task('vscode-reh-win32-ia32-min', noop);
 gulp.task('vscode-reh-win32-x64-min', noop);
 gulp.task('vscode-reh-darwin-min', noop);
@@ -47,7 +46,6 @@ gulp.task('vscode-reh-linux-armhf-min', noop);
 gulp.task('vscode-reh-linux-arm64-min', noop);
 gulp.task('vscode-reh-linux-alpine-min', noop);
 
-gulp.task('vscode-reh-web-win32-arm64-min', noop);
 gulp.task('vscode-reh-web-win32-ia32-min', noop);
 gulp.task('vscode-reh-web-win32-x64-min', noop);
 gulp.task('vscode-reh-web-darwin-min', noop);

build/gulpfile.vscode.win32.js

@@ -110,10 +110,8 @@ function defineWin32SetupTasks(arch, target) {
 	gulp.task(task.define(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target))));
 }
 
-defineWin32SetupTasks('arm64', 'system');
 defineWin32SetupTasks('ia32', 'system');
 defineWin32SetupTasks('x64', 'system');
-defineWin32SetupTasks('arm64', 'user');
 defineWin32SetupTasks('ia32', 'user');
 defineWin32SetupTasks('x64', 'user');
 
@@ -145,7 +143,6 @@ function updateIcon(executablePath) {
 	};
 }
 
-gulp.task(task.define('vscode-win32-arm64-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
 

build/npm/postinstall.js

@@ -23,24 +23,29 @@ function yarnInstall(location, opts) {
 	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
 
 	console.log(`Installing dependencies in ${location}...`);
-	if (location.startsWith("remote") && process.env["npm_config_arch"] == "arm64") {
-		// Temporarily set remote arch to x86, because the remote portion builds
-		// against node, which is not consistently supported on Windows on Arm
-		// (yet).
-		opts.npm_config_arch = "ia32"
-	}
 	console.log(`$ yarn ${args.join(' ')}`);
 	const result = cp.spawnSync(yarn, args, opts);
 	if (result.error || result.status !== 0) {
 		process.exit(1);
 	}
 }
 
+function remoteOpts() {
+	opts = {};
+	if (process.env["npm_config_arch"] == "arm64") {
+		// Temporarily set remote arch to x86, because the remote portion builds
+		// against node, which is not consistently supported on Windows on Arm
+		// (yet).
+		opts.npm_config_arch = "ia32"
+	}
+	return opts;
+}
+
 yarnInstall('extensions'); // node modules shared by all extensions
 
-yarnInstall('remote'); // node modules used by vscode server
+yarnInstall('remote', remoteOpts()); // node modules used by vscode server
 
-yarnInstall('remote/web'); // node modules used by vscode web
+yarnInstall('remote/web', remoteOpts()); // node modules used by vscode web
 
 const allExtensionFolders = fs.readdirSync('extensions');
 const extensions = allExtensionFolders.filter(e => {