Skip to content

Commit f176bee

Browse files
joaomorenojoaomoreno
authored
Cleanup distro dependencies installation (microsoft#76893)
* depend directly on vsda * add vsda to remote * remove vsda cleanup rules * update distro * upgrade vsda * update distro * update vsda * remove vsda * add vsda rules * distro * distro
1 parent 3ea5c9d commit f176bee

10 files changed

Lines changed: 17 additions & 105 deletions

‎build/.nativeignore‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ nsfw/includes/**
9191
!nsfw/build/Release/*.node
9292
!nsfw/**/*.a
9393

94+
vsda/build/**
95+
vsda/ci/**
96+
vsda/src/**
97+
vsda/.gitignore
9498
vsda/binding.gyp
9599
vsda/README.md
96-
vsda/build/**
97-
vsda/*.bat
98-
vsda/*.sh
99-
vsda/*.cpp
100-
vsda/*.h
100+
vsda/targets
101101
!vsda/build/Release/vsda.node
102102

103103
vscode-windows-ca-certs/**/*

‎build/azure-pipelines/common/installDistroDependencies.ts‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎build/azure-pipelines/darwin/product-build-darwin.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ steps:
3636
set -e
3737
3838
cat << EOF > ~/.netrc
39-
machine monacotools.visualstudio.com
40-
password $(devops-pat)
4139
machine github.com
4240
login vscode
4341
password $(github-distro-mixin-password)
@@ -56,7 +54,7 @@ steps:
5654

5755
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
5856
inputs:
59-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
57+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
6058
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
6159
vstsFeed: 'npm-vscode'
6260

@@ -68,7 +66,7 @@ steps:
6866

6967
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
7068
inputs:
71-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
69+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
7270
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7371
vstsFeed: 'npm-vscode'
7472
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
@@ -79,12 +77,6 @@ steps:
7977
displayName: Run postinstall scripts
8078
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
8179

82-
- script: |
83-
set -e
84-
CHILD_CONCURRENCY=1 node build/azure-pipelines/common/installDistroDependencies.js
85-
CHILD_CONCURRENCY=1 node build/azure-pipelines/common/installDistroDependencies.js remote
86-
displayName: Install distro dependencies
87-
8880
- script: |
8981
set -e
9082
yarn gulp mixin

‎build/azure-pipelines/linux/product-build-linux-multiarch.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ steps:
4545
set -e
4646
4747
cat << EOF > ~/.netrc
48-
machine monacotools.visualstudio.com
49-
password $(devops-pat)
5048
machine github.com
5149
login vscode
5250
password $(github-distro-mixin-password)
@@ -65,7 +63,7 @@ steps:
6563

6664
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
6765
inputs:
68-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
66+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
6967
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7068
vstsFeed: 'npm-vscode'
7169

@@ -77,7 +75,7 @@ steps:
7775

7876
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
7977
inputs:
80-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
78+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
8179
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
8280
vstsFeed: 'npm-vscode'
8381
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

‎build/azure-pipelines/linux/product-build-linux.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ steps:
3737
export npm_config_arch="$(VSCODE_ARCH)"
3838
3939
cat << EOF > ~/.netrc
40-
machine monacotools.visualstudio.com
41-
password $(devops-pat)
4240
machine github.com
4341
login vscode
4442
password $(github-distro-mixin-password)
@@ -57,7 +55,7 @@ steps:
5755

5856
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
5957
inputs:
60-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
58+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
6159
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
6260
vstsFeed: 'npm-vscode'
6361

@@ -69,7 +67,7 @@ steps:
6967

7068
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
7169
inputs:
72-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
70+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
7371
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7472
vstsFeed: 'npm-vscode'
7573
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
@@ -80,12 +78,6 @@ steps:
8078
displayName: Run postinstall scripts
8179
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
8280

83-
- script: |
84-
set -e
85-
CHILD_CONCURRENCY=1 node build/azure-pipelines/common/installDistroDependencies.js
86-
CHILD_CONCURRENCY=1 node build/azure-pipelines/common/installDistroDependencies.js remote
87-
displayName: Install distro dependencies
88-
8981
- script: |
9082
set -e
9183
yarn gulp mixin

‎build/azure-pipelines/product-compile.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ steps:
3434
export npm_config_arch="$(VSCODE_ARCH)"
3535
3636
cat << EOF > ~/.netrc
37-
machine monacotools.visualstudio.com
38-
password $(devops-pat)
3937
machine github.com
4038
login vscode
4139
password $(github-distro-mixin-password)
@@ -56,7 +54,7 @@ steps:
5654

5755
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
5856
inputs:
59-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
57+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
6058
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
6159
vstsFeed: 'npm-vscode'
6260
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
@@ -69,7 +67,7 @@ steps:
6967

7068
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
7169
inputs:
72-
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
70+
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
7371
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7472
vstsFeed: 'npm-vscode'
7573
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
@@ -80,13 +78,6 @@ steps:
8078
displayName: Run postinstall scripts
8179
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
8280

83-
- script: |
84-
set -e
85-
CHILD_CONCURRENCY=1 node build/azure-pipelines/common/installDistroDependencies.js
86-
CHILD_CONCURRENCY=1 node build/azure-pipelines/common/installDistroDependencies.js remote
87-
displayName: Install distro dependencies
88-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
89-
9081
# Mixin must run before optimize, because the CSS loader will
9182
# inline small SVGs
9283
- script: |

‎build/azure-pipelines/win32/product-build-win32.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ steps:
4040
- powershell: |
4141
. build/azure-pipelines/win32/exec.ps1
4242
$ErrorActionPreference = "Stop"
43-
"machine monacotools.visualstudio.com`npassword $(devops-pat)`nmachine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
43+
"machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
4444
4545
exec { git config user.email "vscode@microsoft.com" }
4646
exec { git config user.name "VSCode" }
@@ -59,7 +59,7 @@ steps:
5959

6060
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
6161
inputs:
62-
keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
62+
keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
6363
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
6464
vstsFeed: 'npm-vscode'
6565

@@ -74,7 +74,7 @@ steps:
7474

7575
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
7676
inputs:
77-
keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
77+
keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
7878
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7979
vstsFeed: 'npm-vscode'
8080
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
@@ -86,15 +86,6 @@ steps:
8686
displayName: Run postinstall scripts
8787
condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
8888

89-
- powershell: |
90-
. build/azure-pipelines/win32/exec.ps1
91-
$ErrorActionPreference = "Stop"
92-
$env:npm_config_arch="$(VSCODE_ARCH)"
93-
$env:CHILD_CONCURRENCY="1"
94-
exec { node build/azure-pipelines/common/installDistroDependencies.js }
95-
exec { node build/azure-pipelines/common/installDistroDependencies.js remote }
96-
displayName: Install distro dependencies
97-
9889
- powershell: |
9990
. build/azure-pipelines/win32/exec.ps1
10091
$ErrorActionPreference = "Stop"

‎build/gulpfile.mixin.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ gulp.task('mixin', function () {
2828
return vfs
2929
.src(`quality/${quality}/**`, { base: `quality/${quality}` })
3030
.pipe(filter(f => !f.isDirectory()))
31-
.pipe(filter(['**', '!**/package.json']))
3231
.pipe(productJsonFilter)
3332
.pipe(buffer())
3433
.pipe(json(o => Object.assign({}, require('../product.json'), o)))

‎build/gulpfile.vscode.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -311,19 +311,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
311311

312312
const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
313313

314-
// Collect distro dependencies, if any
315-
if (quality) {
316-
const qualityPackagePath = path.join(root, 'quality', quality, 'package.json');
317-
318-
if (fs.existsSync(qualityPackagePath)) {
319-
const pkg = JSON.parse(fs.readFileSync(qualityPackagePath, 'utf8'));
320-
321-
// @ts-ignore JSON checking: dependencies is optional
322-
const distroDependencies = _.flatten(Object.keys(pkg.dependencies || {}).map(d => [`node_modules/${d}/**`, `!node_modules/${d}/**/{test,tests}/**`]));
323-
dependenciesSrc.push(...distroDependencies);
324-
}
325-
}
326-
327314
const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
328315
.pipe(filter(['**', '!**/package-lock.json']))
329316
.pipe(util.cleanNodeModules(path.join(__dirname, '.nativeignore')))

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.37.0",
4-
"distro": "2069209483770ea54d4a020efa830fdc2d574025",
4+
"distro": "382ae0863e9d7c4b14a176686e2065cf7f7f5a18",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

0 commit comments

Comments
 (0)