mirror of
https://github.com/microsoft/vscode.git
synced 2025-12-24 20:26:08 +00:00
Generate ADMX/ADML policy declaration files from static analysis
Fixes: #148941
This commit is contained in:
@@ -47,9 +47,9 @@ for (let dir of dirs) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (dir === 'build/lib/watch') {
|
||||
if (dir === 'build') {
|
||||
// node modules for watching, specific to host node version, not electron
|
||||
yarnInstallBuildDependencies();
|
||||
yarnInstallBuildDependencies(dir);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -73,11 +73,10 @@ for (let dir of dirs) {
|
||||
yarnInstall(dir, opts);
|
||||
}
|
||||
|
||||
function yarnInstallBuildDependencies() {
|
||||
// make sure we install the deps of build/lib/watch for the system installed
|
||||
function yarnInstallBuildDependencies(dir) {
|
||||
// make sure we install the deps of build for the system installed
|
||||
// node, since that is the driver of gulp
|
||||
const watchPath = path.join(path.dirname(__dirname), 'lib', 'watch');
|
||||
const yarnrcPath = path.join(watchPath, '.yarnrc');
|
||||
const yarnrcPath = path.join(dir, '.yarnrc');
|
||||
|
||||
const disturl = 'https://nodejs.org/download/release';
|
||||
const target = process.versions.node;
|
||||
@@ -88,7 +87,7 @@ target "${target}"
|
||||
runtime "${runtime}"`;
|
||||
|
||||
fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
|
||||
yarnInstall(watchPath);
|
||||
yarnInstall(dir);
|
||||
}
|
||||
|
||||
cp.execSync('git config pull.rebase merges');
|
||||
|
||||
Reference in New Issue
Block a user