Skip to content

Commit ef8b148

Browse files
authored
build: use new cli patch method (microsoft#187629)
1 parent 4295a96 commit ef8b148

File tree

7 files changed

+3
-119
lines changed

7 files changed

+3
-119
lines changed

build/azure-pipelines/alpine/cli-build-alpine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ steps:
3030
workingDirectory: build
3131
displayName: Install pipeline build
3232
33-
- script: node build/azure-pipelines/distro/apply-cli-patches
33+
- script: node .build/distro/cli-patches/index.js
3434
displayName: Apply distro patches
3535

3636
- task: Npm@1
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
steps:
22
- template: ../distro/download-distro.yml
33

4-
- task: Cache@2
5-
inputs:
6-
key: '"build_node_modules" | build/yarn.lock'
7-
path: build/node_modules
8-
cacheHitVar: BUILD_NODE_MODULES_RESTORED
9-
displayName: Restore node_modules cache
10-
11-
- script: yarn --frozen-lockfile --ignore-optional --check-files
12-
workingDirectory: build
13-
condition: and(succeeded(), ne(variables.BUILD_NODE_MODULES_RESTORED, 'true'))
14-
displayName: Install pipeline build
15-
16-
- script: node build/azure-pipelines/distro/apply-cli-patches
4+
- script: node .build/distro/cli-patches/index.js
175
displayName: Apply distro patches

build/azure-pipelines/distro/apply-cli-patches.js

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

build/azure-pipelines/distro/apply-cli-patches.ts

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

build/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"@azure/identity": "^3.1.3",
88
"@azure/storage-blob": "^12.13.0",
99
"@electron/get": "^1.12.4",
10-
"@iarna/toml": "^2.2.5",
1110
"@types/ansi-colors": "^3.2.0",
1211
"@types/byline": "^4.2.32",
1312
"@types/cssnano": "^4.0.0",
@@ -24,7 +23,6 @@
2423
"@types/gulp-postcss": "^8.0.0",
2524
"@types/gulp-rename": "^0.0.33",
2625
"@types/gulp-sourcemaps": "^0.0.32",
27-
"@types/iarna__toml": "^2.0.2",
2826
"@types/mime": "0.0.29",
2927
"@types/minimatch": "^3.0.3",
3028
"@types/minimist": "^1.2.1",

build/yarn.lock

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,6 @@
339339
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz#e81fb49de05fed91bf74251c9ca0343f4fc77d31"
340340
integrity sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==
341341

342-
"@iarna/toml@^2.2.5":
343-
version "2.2.5"
344-
resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
345-
integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
346-
347342
"@malept/cross-spawn-promise@^1.1.0":
348343
version "1.1.1"
349344
resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
@@ -506,13 +501,6 @@
506501
"@types/undertaker" "*"
507502
"@types/vinyl-fs" "*"
508503

509-
"@types/iarna__toml@^2.0.2":
510-
version "2.0.2"
511-
resolved "https://registry.yarnpkg.com/@types/iarna__toml/-/iarna__toml-2.0.2.tgz#2e61b079e50760b477bc70e4df1fe5b633ef6c63"
512-
integrity sha512-Q3obxKhBLVVbEQ8zsAmsQVobAAZhi8dFFFjF0q5xKXiaHvH8IkSxcbM27e46M9feUMieR03SPpmp5CtaNzpdBg==
513-
dependencies:
514-
"@types/node" "*"
515-
516504
"@types/js-beautify@*":
517505
version "1.8.0"
518506
resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.8.0.tgz#0369d3d0e1f35a6aec07cb4da2ee2bcda111367c"

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.81.0",
4-
"distro": "ce5df90ac966be777544d3f332705138a9e4d73e",
4+
"distro": "bed7b201bc6ebbfc63268cb4c390d788a86b0192",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

0 commit comments

Comments
 (0)