Patch yarnInstall for openvscode-release

docusign · Aug 30, 2024 · c839041 · c839041
1 parent 507168c
commit c839041
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
@@ -1,6 +1,6 @@
-68a17006021975ff271a1dd615f9db9eda7c25f2cc65e750c87980dc57a06c94  aarch64-linux-gnu-glibc-2.17.tar.gz
-0de422a81683cf9e8cf875dbd1e0c27545ac3c775b2d53015daf3ca2b31d3f15  aarch64-linux-gnu-glibc-2.28.tar.gz
-3ced48cb479f2cdba95aa649710fcb7778685551c745bbd76ac706c3c0ead9fb  arm-rpi-linux-gnueabihf-glibc-2.17.tar.gz
-7aea163f7fad8cc50000c86b5108be880121d35e2f55d016ef8c96bbe54129eb  arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
-5aae21115f1d284c3cdf32c83db15771b59bc80793f1423032abf5a823c0d658  x86_64-linux-gnu-glibc-2.17.tar.gz
-dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784  x86_64-linux-gnu-glibc-2.28.tar.gz
+4aa30f61adde7839ca5616e23cb44625a16b4dd77e5ce38df214d8dfbf4d3596  aarch64-linux-gnu-glibc-2.17.tar.gz
+4a00f87f0d109f66698244cf2bca4c237ff5bb84be4953bd2e624df7d46a4ccb  aarch64-linux-gnu-glibc-2.28.tar.gz
+76226b2a2be87c1d6cbd60371df30b2794d7c9595794786e1be34318be201948  arm-rpi-linux-gnueabihf-glibc-2.17.tar.gz
+3625f8b5e36a42615f904fa3c222dcf35e37d4a46c2ea52f81cad36af5d1c07a  arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
+2ab8ad5a09270df7562ff79662f07c23d857ca19fa34dbe63999feabf4375bbb  x86_64-linux-gnu-glibc-2.17.tar.gz
+e655175b6143145f5d5f7d84a894f405e0df597b811a507dced6ead03f773bcb  x86_64-linux-gnu-glibc-2.28.tar.gz
diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
@@ -82,7 +82,7 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
 		const timeout = setTimeout(() => controller.abort(), 30 * 1000);
 		const version = '20240129-253798';
 		try {
-			const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
+			const response = await fetch(`https://api.github.com/repos/gitpod-io/vscode-linux-build-agent/releases/tags/v${version}`, {
 				headers: ghApiHeaders,
 				signal: controller.signal as any /* Typings issue with lib.dom.d.ts */
 			});
@@ -91,7 +91,7 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
 				const contents = Buffer.from(await response.arrayBuffer());
 				const asset = JSON.parse(contents.toString()).assets.find((a: { name: string }) => a.name === options.assetName);
 				if (!asset) {
-					throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
+					throw new Error(`Could not find asset in release of gitpod-io/vscode-linux-build-agent @ ${version}`);
 				}
 				console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
 				const assetResponse = await fetch(asset.url, {

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
@@ -57,7 +57,7 @@ function yarnInstall(dir, opts) {
 		if (process.env['npm_config_arch'] === 'arm64') {
 			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
 		}
-		run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
+		run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, /* '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, */process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
 		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${dir}/node_modules`], opts);
 	} else {
 		console.log(`Installing dependencies in ${dir}...`);