Strona główna Odkrywaj Pomoc
Zaloguj się
mirrors
/
vscodium
kopia lustrzana https://github.com/VSCodium/vscodium
2
0
Forkuj 0
Pliki Problemy 0 Wiki
Drzewo: 096bb6e6d7
Gałęzie Tagi
vscodium
/
patches
/
linux
/
yarn-dependencies.patch

yarn-dependencies.patch 1.9 KB
Historia Czysty

12345678910111213141516171819202122 
  1. diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
    2. 

  2. index 72dd74f..0f70d8c 100644
    3. 

  3. --- a/build/npm/postinstall.js
    4. 

  4. +++ b/build/npm/postinstall.js
    5. 

  5. @@ -50,3 +50,3 @@ function yarnInstall(dir, opts) {
    6. 

  6.  
    7. 

  7. -	if (process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'] && /^(.build\/distro\/npm\/)?remote$/.test(dir)) {
    8. 

  8. +	if (process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']) {
    9. 

  9.  		const userinfo = os.userInfo();
    10. 

  10. @@ -55,10 +55,6 @@ function yarnInstall(dir, opts) {
    11. 

  11.  		opts.cwd = root;
    12. 

  12. -		if (process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm') {
    13. 

  13. +		if (process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm' || process.env['npm_config_arch'] === 'ppc64') {
    14. 

  14.  			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
    15. 

  15.  		}
    16. 

  16. -		if (process.env['npm_config_arch'] === 'arm') {
    17. 

  17. -			run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/home/builduser`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/home/builduser/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts);
    18. 

  18. -		} else {
    19. 

  19. -			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);
    20. 

  20. -		}
    21. 

  21. +		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);
    22. 

  22.  		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${dir}/node_modules`], opts);
    23.