Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ef893f0c
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ef893f0c
编写于
7月 05, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert build perf
上级
8cbdf09a
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
314 addition
and
166 deletion
+314
-166
build/.cachesalt
build/.cachesalt
+0
-1
build/azure-pipelines/compile.yml
build/azure-pipelines/compile.yml
+78
-0
build/azure-pipelines/darwin/product-build-darwin.yml
build/azure-pipelines/darwin/product-build-darwin.yml
+25
-28
build/azure-pipelines/linux/build-alpine.sh
build/azure-pipelines/linux/build-alpine.sh
+0
-0
build/azure-pipelines/linux/build-arm.sh
build/azure-pipelines/linux/build-arm.sh
+0
-0
build/azure-pipelines/linux/prebuild-alpine.sh
build/azure-pipelines/linux/prebuild-alpine.sh
+0
-0
build/azure-pipelines/linux/prebuild-arm.sh
build/azure-pipelines/linux/prebuild-arm.sh
+0
-0
build/azure-pipelines/linux/product-build-linux-alpine.yml
build/azure-pipelines/linux/product-build-linux-alpine.yml
+108
-0
build/azure-pipelines/linux/product-build-linux-arm.yml
build/azure-pipelines/linux/product-build-linux-arm.yml
+17
-26
build/azure-pipelines/linux/product-build-linux.yml
build/azure-pipelines/linux/product-build-linux.yml
+26
-29
build/azure-pipelines/linux/publish-alpine.sh
build/azure-pipelines/linux/publish-alpine.sh
+0
-0
build/azure-pipelines/linux/publish-arm.sh
build/azure-pipelines/linux/publish-arm.sh
+0
-0
build/azure-pipelines/product-build.yml
build/azure-pipelines/product-build.yml
+16
-31
build/azure-pipelines/win32/product-build-win32.yml
build/azure-pipelines/win32/product-build-win32.yml
+33
-24
build/gulpfile.compile.js
build/gulpfile.compile.js
+0
-2
build/gulpfile.vscode.js
build/gulpfile.vscode.js
+7
-18
package.json
package.json
+2
-2
src/vs/workbench/services/keybinding/browser/keybindingService.ts
...orkbench/services/keybinding/browser/keybindingService.ts
+1
-1
src/vs/workbench/services/textfile/test/textFileService.io.test.ts
...rkbench/services/textfile/test/textFileService.io.test.ts
+1
-4
未找到文件。
build/.cachesalt
已删除
100644 → 0
浏览文件 @
8cbdf09a
1
\ No newline at end of file
build/azure-pipelines/compile.yml
0 → 100644
浏览文件 @
ef893f0c
steps
:
-
task
:
AzureKeyVault@1
displayName
:
'
Azure
Key
Vault:
Get
Secrets'
inputs
:
azureSubscription
:
'
vscode-builds-subscription'
KeyVaultName
:
vscode
-
task
:
NodeTool@0
inputs
:
versionSpec
:
"
10.15.1"
-
script
:
|
set -e
cat << EOF > ~/.netrc
machine monacotools.visualstudio.com
password $(devops-pat)
machine github.com
login vscode
password $(github-distro-mixin-password)
EOF
git config user.email "vscode@microsoft.com"
git config user.name "VSCode"
displayName
:
Prepare tooling
-
script
:
|
set -e
git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
git fetch distro
git merge $(node -p "require('./package.json').distro")
displayName
:
Merge distro
# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
# inputs:
# keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
# vstsFeed: '$(ArtifactFeed)'
-
task
:
geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs
:
versionSpec
:
"
1.10.1"
-
script
:
'
yarn
--frozen-lockfile'
displayName
:
Install Dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
# inputs:
# keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
# targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
# vstsFeed: '$(ArtifactFeed)'
# condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
script
:
'
yarn
gulp
mixin'
displayName
:
Mix in quality
-
script
:
'
yarn
gulp
hygiene'
displayName
:
Run hygiene checks
-
script
:
'
yarn
monaco-compile-check'
displayName
:
Run Monaco compilation checks
-
script
:
|
set -e
cd $BUILD_STAGINGDIRECTORY
git clone https://github.com/microsoft/vscode-telemetry-extractor.git
cd vscode-telemetry-extractor
git checkout 3b04aba5bfdfcca1a5426cd2c51a90d18740d0bc
npm i
npm run setup-extension-repos
node ./out/cli-extract.js --sourceDir $BUILD_SOURCESDIRECTORY --excludedDirPattern extensions --outputDir . --applyEndpoints --includeIsMeasurement --patchWebsiteEvents
node ./out/cli-extract-extensions.js --sourceDir ./src/telemetry-sources --outputDir . --applyEndpoints --includeIsMeasurement
mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
mv declarations-extensions-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
displayName
:
Extract Telemetry
-
script
:
'
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
./build/azure-pipelines/linux/build.sh'
displayName
:
Build
\ No newline at end of file
build/azure-pipelines/darwin/product-build-darwin.yml
浏览文件 @
ef893f0c
steps
:
-
script
:
|
mkdir -p .build
echo -n $BUILD_SOURCEVERSION > .build/commit
displayName
:
Prepare cache flag
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
.build/commit'
targetfolder
:
'
.build,
**/out-build,
**/out-vscode-min,
**/out-vscode-reh-min,
**/out-vscode-web-min'
vstsFeed
:
'
npm-vscode'
platformIndependent
:
true
alias
:
'
Compilation'
-
script
:
|
set -e
exit 1
displayName
:
Check RestoreCache
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
NodeTool@0
inputs
:
versionSpec
:
"
10.15.1"
...
...
@@ -56,19 +37,19 @@ steps:
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
-
script
:
|
set -e
CHILD_CONCURRENCY=1
yarn --frozen-lockfile
yarn --frozen-lockfile
displayName
:
Install dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
...
...
@@ -79,25 +60,41 @@ steps:
displayName
:
Run postinstall scripts
condition
:
and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
script
:
|
set -e
yarn gulp mixin
displayName
:
Mix in quality
-
script
:
|
set -e
yarn gulp hygiene
yarn monaco-compile-check
displayName
:
Run hygiene checks
condition
:
and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
script
:
|
set -e
node build/azure-pipelines/common/installDistroDependencies.js
node build/azure-pipelines/common/installDistroDependencies.js remote
displayName
:
Install distro dependencies
node build/lib/builtInExtensions.js
displayName
:
Install distro dependencies and extensions
-
script
:
|
set -e
yarn gulp mixin
displayName
:
Mix in qualit
y
./build/azure-pipelines/common/extract-telemetry.sh
displayName
:
Extract Telemetr
y
-
script
:
|
set -e
yarn gulp compile-build
yarn gulp compile-extensions-build-legacy
yarn gulp compile-extensions-build
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
yarn gulp vscode-darwin-
min-
ci
yarn gulp vscode-darwin-ci
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
yarn gulp vscode-reh-darwin-
min-
ci
yarn gulp vscode-reh-darwin-ci
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
yarn gulp vscode-web-darwin-
min-
ci
yarn gulp vscode-web-darwin-ci
AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
yarn gulp upload-vscode-sourcemaps
displayName
:
Build
...
...
build/azure-pipelines/linux/
multiarch/alpine/build
.sh
→
build/azure-pipelines/linux/
build-alpine
.sh
浏览文件 @
ef893f0c
文件已移动
build/azure-pipelines/linux/
multiarch/alpine/prebuild
.sh
→
build/azure-pipelines/linux/
build-arm
.sh
浏览文件 @
ef893f0c
文件已移动
build/azure-pipelines/linux/
multiarch/alpine/publish
.sh
→
build/azure-pipelines/linux/
prebuild-alpine
.sh
浏览文件 @
ef893f0c
文件已移动
build/azure-pipelines/linux/
multiarch/armhf/build
.sh
→
build/azure-pipelines/linux/
prebuild-arm
.sh
浏览文件 @
ef893f0c
文件已移动
build/azure-pipelines/
product-compil
e.yml
→
build/azure-pipelines/
linux/product-build-linux-alpin
e.yml
浏览文件 @
ef893f0c
steps
:
-
script
:
|
mkdir -p .build
echo -n $BUILD_SOURCEVERSION > .build/commit
displayName
:
Prepare cache flag
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
.build/commit'
targetfolder
:
'
.build,
**/out-build,
**/out-vscode-min,
**/out-vscode-reh-min,
**/out-vscode-web-min'
vstsFeed
:
'
npm-vscode'
platformIndependent
:
true
alias
:
'
Compilation'
-
task
:
NodeTool@0
inputs
:
versionSpec
:
"
10.15.1"
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs
:
versionSpec
:
"
1.10.1"
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
AzureKeyVault@1
displayName
:
'
Azure
Key
Vault:
Get
Secrets'
inputs
:
azureSubscription
:
'
vscode-builds-subscription'
KeyVaultName
:
vscode
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
Docker@1
displayName
:
'
Pull
image'
inputs
:
azureSubscriptionEndpoint
:
'
vscode-builds-subscription'
azureContainerRegistry
:
vscodehub.azurecr.io
command
:
'
Run
an
image'
imageName
:
'
vscode-linux-build-agent:alpine'
containerCommand
:
uname
-
script
:
|
set -e
export npm_config_arch="$(VSCODE_ARCH)"
cat << EOF > ~/.netrc
machine monacotools.visualstudio.com
...
...
@@ -44,7 +36,6 @@ steps:
git config user.email "vscode@microsoft.com"
git config user.name "VSCode"
displayName
:
Prepare tooling
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
script
:
|
set -e
...
...
@@ -52,70 +43,66 @@ steps:
git fetch distro
git merge $(node -p "require('./package.json').distro")
displayName
:
Merge distro
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
script
:
|
set -e
CHILD_CONCURRENCY=1
yarn --frozen-lockfile
yarn --frozen-lockfile
displayName
:
Install dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored
-Compilation'], 'true'), ne(variables['CacheRestored
'], 'true'))
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
condition
:
and(succeeded(), ne(variables['CacheRestored
-Compilation'], 'true'), ne(variables['CacheRestored
'], 'true'))
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
script
:
|
set -e
yarn postinstall
displayName
:
Run postinstall scripts
condition
:
and(succeeded(),
ne(variables['CacheRestored-Compilation'], 'true'),
eq(variables['CacheRestored'], 'true'))
condition
:
and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
script
:
|
set -e
node build/azure-pipelines/common/installDistroDependencies.js
node build/azure-pipelines/common/installDistroDependencies.js remote
displayName
:
Install distro dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
yarn gulp mixin
displayName
:
Mix in quality
-
script
:
|
set -e
yarn gulp hygiene
yarn monaco-compile-check
displayName
:
Run hygiene checks
condition
:
and(succeeded(),
ne(variables['CacheRestored-Compilation'], 'true'),
eq(variables['VSCODE_STEP_ON_IT'], 'false'))
condition
:
and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
script
:
|
set -
./build/azure-pipelines/common/extract-telemetry.sh
displayName
:
Extract Telemetry
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
set -e
./build/azure-pipelines/linux/prebuild-alpine.sh
displayName
:
Prepare build
-
script
:
|
set -e
yarn gulp compile-build
yarn gulp compile-extensions-build-legacy
yarn gulp compile-extensions-build
yarn gulp minify-vscode
yarn gulp minify-vscode-reh
yarn gulp minify-vscode-web
displayName
:
Compile
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
./build/azure-pipelines/linux/build-alpine.sh
displayName
:
Build
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
inputs
:
keyfile
:
'
.build/commit'
targetfolder
:
'
.build,
**/out-build,
**/out-vscode-min,
**/out-vscode-reh-min,
**/out-vscode-web-min'
vstsFeed
:
'
npm-vscode'
platformIndependent
:
true
alias
:
'
Compilation'
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
\ No newline at end of file
-
script
:
|
set -e
AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
./build/azure-pipelines/linux/publish-alpine.sh
displayName
:
Publish
-
task
:
ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName
:
'
Component
Detection'
continueOnError
:
true
\ No newline at end of file
build/azure-pipelines/linux/product-build-linux-
multiarch
.yml
→
build/azure-pipelines/linux/product-build-linux-
arm
.yml
浏览文件 @
ef893f0c
steps
:
-
script
:
|
mkdir -p .build
echo -n $BUILD_SOURCEVERSION > .build/commit
displayName
:
Prepare cache flag
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
.build/commit'
targetfolder
:
'
.build,
**/out-build,
**/out-vscode-min,
**/out-vscode-reh-min,
**/out-vscode-web-min'
vstsFeed
:
'
npm-vscode'
platformIndependent
:
true
alias
:
'
Compilation'
-
script
:
|
set -e
exit 1
displayName
:
Check RestoreCache
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
NodeTool@0
inputs
:
versionSpec
:
"
10.15.1"
...
...
@@ -38,7 +19,7 @@ steps:
azureSubscriptionEndpoint
:
'
vscode-builds-subscription'
azureContainerRegistry
:
vscodehub.azurecr.io
command
:
'
Run
an
image'
imageName
:
'
vscode-linux-build-agent:
$(VSCODE_ARCH)
'
imageName
:
'
vscode-linux-build-agent:
armhf
'
containerCommand
:
uname
-
script
:
|
...
...
@@ -65,19 +46,19 @@ steps:
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
-
script
:
|
set -e
CHILD_CONCURRENCY=1
yarn --frozen-lockfile
yarn --frozen-lockfile
displayName
:
Install dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
...
...
@@ -95,12 +76,22 @@ steps:
-
script
:
|
set -e
./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/prebuild.sh
yarn gulp hygiene
yarn monaco-compile-check
displayName
:
Run hygiene checks
condition
:
and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
script
:
|
set -e
./build/azure-pipelines/linux/prebuild-arm.sh
displayName
:
Prebuild
-
script
:
|
set -e
./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/build.sh
yarn gulp compile-build
yarn gulp compile-extensions-build-legacy
yarn gulp compile-extensions-build
./build/azure-pipelines/linux/build-arm.sh
displayName
:
Build
-
script
:
|
...
...
@@ -109,7 +100,7 @@ steps:
AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
./build/azure-pipelines/linux/
multiarch/$(VSCODE_ARCH)/publish
.sh
./build/azure-pipelines/linux/
publish-arm
.sh
displayName
:
Publish
-
task
:
ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
...
...
build/azure-pipelines/linux/product-build-linux.yml
浏览文件 @
ef893f0c
steps
:
-
script
:
|
mkdir -p .build
echo -n $BUILD_SOURCEVERSION > .build/commit
displayName
:
Prepare cache flag
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
.build/commit'
targetfolder
:
'
.build,
**/out-build,
**/out-vscode-min,
**/out-vscode-reh-min,
**/out-vscode-web-min'
vstsFeed
:
'
npm-vscode'
platformIndependent
:
true
alias
:
'
Compilation'
-
script
:
|
set -e
exit 1
displayName
:
Check RestoreCache
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
NodeTool@0
inputs
:
versionSpec
:
"
10.15.1"
...
...
@@ -57,19 +38,19 @@ steps:
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
-
script
:
|
set -e
CHILD_CONCURRENCY=1
yarn --frozen-lockfile
yarn --frozen-lockfile
displayName
:
Install dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
...
...
@@ -80,19 +61,35 @@ steps:
displayName
:
Run postinstall scripts
condition
:
and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
script
:
|
set -e
yarn gulp mixin
displayName
:
Mix in quality
-
script
:
|
set -e
yarn gulp hygiene
yarn monaco-compile-check
displayName
:
Run hygiene checks
condition
:
and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
script
:
|
set -e
node build/azure-pipelines/common/installDistroDependencies.js
node build/azure-pipelines/common/installDistroDependencies.js remote
displayName
:
Install distro dependencies
node build/lib/builtInExtensions.js
displayName
:
Install distro dependencies and extensions
-
script
:
|
set -e
yarn gulp mixin
displayName
:
Mix in qualit
y
./build/azure-pipelines/common/extract-telemetry.sh
displayName
:
Extract Telemetr
y
-
script
:
|
set -e
yarn gulp compile-build
yarn gulp compile-extensions-build-legacy
yarn gulp compile-extensions-build
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
yarn gulp vscode-linux-$VSCODE_ARCH-min-ci
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
...
...
@@ -122,12 +119,12 @@ steps:
./build/azure-pipelines/linux/publish.sh
displayName
:
Publish
-
task
:
ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName
:
'
Component
Detection'
continueOnError
:
true
-
task
:
PublishPipelineArtifact@0
displayName
:
'
Publish
Pipeline
Artifact'
inputs
:
artifactName
:
snap-$(VSCODE_ARCH)
targetPath
:
.build/linux/snap-tarball
-
task
:
ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName
:
'
Component
Detection'
continueOnError
:
true
build/azure-pipelines/linux/
multiarch/armhf/prebuild
.sh
→
build/azure-pipelines/linux/
publish-alpine
.sh
浏览文件 @
ef893f0c
文件已移动
build/azure-pipelines/linux/
multiarch/armhf/publish
.sh
→
build/azure-pipelines/linux/
publish-arm
.sh
浏览文件 @
ef893f0c
文件已移动
build/azure-pipelines/product-build.yml
浏览文件 @
ef893f0c
...
...
@@ -7,54 +7,45 @@ resources:
image
:
snapcore/snapcraft:stable
jobs
:
-
job
:
Compile
pool
:
vmImage
:
'
Ubuntu-16.04'
variables
:
VSCODE_ARCH
:
x64
container
:
vscode-x64
steps
:
-
template
:
product-compile.yml
# - job: Compile
# pool:
# vmImage: 'Ubuntu-16.04'
# steps:
# - template: compile.yml
-
job
:
Windows
condition
:
and(succeeded(), eq(variables['VSCODE_
COMPILE_ONLY'], 'false'), eq(variables['VSCODE_
BUILD_WIN32'], 'true'))
condition
:
and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
timeoutInMinutes
:
120
pool
:
vmImage
:
VS2017-Win2016
variables
:
VSCODE_ARCH
:
x64
dependsOn
:
-
Compile
steps
:
-
template
:
win32/product-build-win32.yml
-
job
:
Windows32
condition
:
and(succeeded(), eq(variables['VSCODE_
COMPILE_ONLY'], 'false'), eq(variables['VSCODE_
BUILD_WIN32_32BIT'], 'true'))
condition
:
and(succeeded(), eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true'))
timeoutInMinutes
:
120
pool
:
vmImage
:
VS2017-Win2016
variables
:
VSCODE_ARCH
:
ia32
dependsOn
:
-
Compile
steps
:
-
template
:
win32/product-build-win32.yml
-
job
:
Linux
condition
:
and(succeeded(), eq(variables['VSCODE_
COMPILE_ONLY'], 'false'), eq(variables['VSCODE_
BUILD_LINUX'], 'true'))
condition
:
and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
timeoutInMinutes
:
120
pool
:
vmImage
:
'
Ubuntu-16.04'
variables
:
VSCODE_ARCH
:
x64
container
:
vscode-x64
dependsOn
:
-
Compile
steps
:
-
template
:
linux/product-build-linux.yml
-
job
:
LinuxSnap
condition
:
and(succeeded(), eq(variables['VSCODE_
COMPILE_ONLY'], 'false'), eq(variables['VSCODE_
BUILD_LINUX'], 'true'))
condition
:
and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
timeoutInMinutes
:
120
pool
:
vmImage
:
'
Ubuntu-16.04'
...
...
@@ -66,41 +57,35 @@ jobs:
-
template
:
linux/snap-build-linux.yml
-
job
:
LinuxArmhf
condition
:
and(succeeded(), eq(variables['VSCODE_
COMPILE_ONLY'], 'false'), eq(variables['VSCODE_
BUILD_LINUX_ARMHF'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
condition
:
and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
timeoutInMinutes
:
120
pool
:
vmImage
:
'
Ubuntu-16.04'
variables
:
VSCODE_ARCH
:
armhf
dependsOn
:
-
Compile
steps
:
-
template
:
linux/product-build-linux-
multiarch
.yml
-
template
:
linux/product-build-linux-
arm
.yml
-
job
:
LinuxAlpine
condition
:
and(succeeded(), eq(variables['VSCODE_
COMPILE_ONLY'], 'false'), eq(variables['VSCODE_
BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
condition
:
and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
timeoutInMinutes
:
120
pool
:
vmImage
:
'
Ubuntu-16.04'
variables
:
VSCODE_ARCH
:
alpine
dependsOn
:
-
Compile
steps
:
-
template
:
linux/product-build-linux-
multiarch
.yml
-
template
:
linux/product-build-linux-
alpine
.yml
-
job
:
macOS
condition
:
and(succeeded(), eq(variables['VSCODE_
COMPILE_ONLY'], 'false'), eq(variables['VSCODE_
BUILD_MACOS'], 'true'))
condition
:
and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
timeoutInMinutes
:
120
pool
:
vmImage
:
macOS
10.13
dependsOn
:
-
Compile
steps
:
-
template
:
darwin/product-build-darwin.yml
-
job
:
Release
condition
:
and(succeeded(),
eq(variables['VSCODE_COMPILE_ONLY'], 'false'),
or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
condition
:
and(succeeded(), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
pool
:
vmImage
:
'
Ubuntu-16.04'
dependsOn
:
...
...
@@ -117,7 +102,7 @@ jobs:
-
job
:
Mooncake
pool
:
vmImage
:
'
Ubuntu-16.04'
condition
:
and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
condition
:
true
dependsOn
:
-
Windows
-
Windows32
...
...
build/azure-pipelines/win32/product-build-win32.yml
浏览文件 @
ef893f0c
steps
:
-
powershell
:
|
mkdir .build -ea 0
"$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit
displayName
:
Prepare cache flag
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
.build/commit'
targetfolder
:
'
.build,
**/out-build,
**/out-vscode-min,
**/out-vscode-reh-min,
**/out-vscode-web-min'
vstsFeed
:
'
npm-vscode'
platformIndependent
:
true
alias
:
'
Compilation'
-
powershell
:
|
$ErrorActionPreference = "Stop"
exit 1
displayName
:
Check RestoreCache
condition
:
and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
task
:
NodeTool@0
inputs
:
versionSpec
:
"
10.15.1"
...
...
@@ -59,7 +40,7 @@ steps:
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.build/arch,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.build/arch,
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
...
...
@@ -74,7 +55,7 @@ steps:
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
inputs
:
keyfile
:
'
build/.cachesalt,
.build/arch,
.yarnrc,
remote/.yarnrc,
quality/*/package.json
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
keyfile
:
'
.build/arch,
.yarnrc,
remote/.yarnrc
,
**/yarn.lock,
!**/node_modules/**/yarn.lock,
!**/.*/**/yarn.lock'
targetfolder
:
'
**/node_modules,
!**/node_modules/**/node_modules'
vstsFeed
:
'
npm-vscode'
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
...
...
@@ -86,23 +67,51 @@ steps:
displayName
:
Run postinstall scripts
condition
:
and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
powershell
:
|
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
exec { yarn gulp mixin }
displayName
:
Mix in quality
-
powershell
:
|
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
exec { yarn gulp hygiene }
exec { yarn monaco-compile-check }
displayName
:
Run hygiene checks
condition
:
and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
powershell
:
|
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
exec { node build/azure-pipelines/common/installDistroDependencies.js }
exec { node build/azure-pipelines/common/installDistroDependencies.js remote }
displayName
:
Install distro dependencies
exec { node build/lib/builtInExtensions.js }
displayName
:
Install distro dependencies and extensions
-
powershell
:
|
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
exec { yarn gulp mixin }
displayName
:
Mix in quality
cd $env:BUILD_STAGINGDIRECTORY
exec { git clone https://github.com/microsoft/vscode-telemetry-extractor.git }
cd vscode-telemetry-extractor
exec { git checkout f538e3157c84d1bd0b239dfc5ebccac226006d58 }
exec { npm i }
exec { npm run setup-extension-repos }
exec { node .\out\cli-extract.js --sourceDir $env:BUILD_SOURCESDIRECTORY --excludedDirPattern extensions --outputDir . --applyEndpoints --includeIsMeasurement --patchWebsiteEvents }
exec { node .\out\cli-extract-extensions.js --sourceDir .\src\telemetry-sources --outputDir . --applyEndpoints --includeIsMeasurement }
mkdir $env:BUILD_SOURCESDIRECTORY\.build\telemetry -ea 0
mv declarations-resolved.json $env:BUILD_SOURCESDIRECTORY\.build\telemetry\telemetry-core.json
mv declarations-extensions-resolved.json $env:BUILD_SOURCESDIRECTORY\.build\telemetry\telemetry-extensions.json
displayName
:
Extract Telemetry
-
powershell
:
|
. build/azure-pipelines/win32/exec.ps1
$ErrorActionPreference = "Stop"
$env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
exec { yarn gulp compile-build }
exec { yarn gulp compile-extensions-build-legacy }
exec { yarn gulp compile-extensions-build }
exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min-ci" }
exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min-ci" }
exec { yarn gulp "vscode-web-win32-$env:VSCODE_ARCH-min-ci" }
...
...
build/gulpfile.compile.js
浏览文件 @
ef893f0c
...
...
@@ -5,12 +5,10 @@
'
use strict
'
;
const
gulp
=
require
(
'
gulp
'
);
const
util
=
require
(
'
./lib/util
'
);
const
task
=
require
(
'
./lib/task
'
);
const
compilation
=
require
(
'
./lib/compilation
'
);
// Full compile, including nls and inline sources in sourcemaps, for build
const
compileBuildTask
=
task
.
define
(
'
compile-build
'
,
task
.
series
(
util
.
rimraf
(
'
out-build
'
),
compilation
.
compileTask
(
'
src
'
,
'
out-build
'
,
true
)));
gulp
.
task
(
compileBuildTask
);
exports
.
compileBuildTask
=
compileBuildTask
;
\ No newline at end of file
build/gulpfile.vscode.js
浏览文件 @
ef893f0c
...
...
@@ -104,7 +104,6 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
bundleInfo
:
undefined
})
));
gulp
.
task
(
optimizeVSCodeTask
);
const
sourceMappingURLBase
=
`https://ticino.blob.core.windows.net/sourcemaps/
${
commit
}
`
;
const
minifyVSCodeTask
=
task
.
define
(
'
minify-vscode
'
,
task
.
series
(
...
...
@@ -118,7 +117,6 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
},
common
.
minifyTask
(
'
out-vscode
'
,
`
${
sourceMappingURLBase
}
/core`
)
));
gulp
.
task
(
minifyVSCodeTask
);
// Package
...
...
@@ -309,22 +307,13 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
const
telemetry
=
gulp
.
src
(
'
.build/telemetry/**
'
,
{
base
:
'
.build/telemetry
'
,
dot
:
true
});
const
dependenciesSrc
=
_
.
flatten
(
productionDependencies
.
map
(
d
=>
path
.
relative
(
root
,
d
.
path
)).
map
(
d
=>
[
`
${
d
}
/**`
,
`!
${
d
}
/**/{test,tests}/**`
]));
const
depsSrc
=
[
...
_
.
flatten
(
productionDependencies
.
map
(
d
=>
path
.
relative
(
root
,
d
.
path
)).
map
(
d
=>
[
`
${
d
}
/**`
,
`!
${
d
}
/**/{test,tests}/**`
])),
// @ts-ignore JSON checking: dependencies is optional
...
_
.
flatten
(
Object
.
keys
(
product
.
dependencies
||
{}).
map
(
d
=>
[
`node_modules/
${
d
}
/**`
,
`!node_modules/
${
d
}
/**/{test,tests}/**`
]))
];
// Collect distro dependencies, if any
if
(
quality
)
{
const
qualityPackagePath
=
path
.
join
(
root
,
'
quality
'
,
quality
,
'
package.json
'
);
if
(
fs
.
existsSync
(
qualityPackagePath
))
{
const
pkg
=
JSON
.
parse
(
fs
.
readFileSync
(
qualityPackagePath
,
'
utf8
'
));
// @ts-ignore JSON checking: dependencies is optional
const
distroDependencies
=
_
.
flatten
(
Object
.
keys
(
pkg
.
dependencies
||
{}).
map
(
d
=>
[
`node_modules/
${
d
}
/**`
,
`!node_modules/
${
d
}
/**/{test,tests}/**`
]));
dependenciesSrc
.
push
(...
distroDependencies
);
}
}
const
deps
=
gulp
.
src
(
dependenciesSrc
,
{
base
:
'
.
'
,
dot
:
true
})
const
deps
=
gulp
.
src
(
depsSrc
,
{
base
:
'
.
'
,
dot
:
true
})
.
pipe
(
filter
([
'
**
'
,
'
!**/package-lock.json
'
]))
.
pipe
(
util
.
cleanNodeModules
(
path
.
join
(
__dirname
,
'
.nativeignore
'
)))
.
pipe
(
createAsar
(
path
.
join
(
process
.
cwd
(),
'
node_modules
'
),
[
'
**/*.node
'
,
'
**/vscode-ripgrep/bin/*
'
,
'
**/node-pty/build/Release/*
'
],
'
app/node_modules.asar
'
));
...
...
@@ -449,6 +438,7 @@ BUILD_TARGETS.forEach(buildTarget => {
const
destinationFolderName
=
`VSCode
${
dashed
(
platform
)}${
dashed
(
arch
)}
`
;
const
vscodeTaskCI
=
task
.
define
(
`vscode
${
dashed
(
platform
)}${
dashed
(
arch
)}${
dashed
(
minified
)}
-ci`
,
task
.
series
(
minified
?
minifyVSCodeTask
:
optimizeVSCodeTask
,
util
.
rimraf
(
path
.
join
(
buildRoot
,
destinationFolderName
)),
packageTask
(
platform
,
arch
,
sourceFolderName
,
destinationFolderName
,
opts
)
));
...
...
@@ -457,7 +447,6 @@ BUILD_TARGETS.forEach(buildTarget => {
const
vscodeTask
=
task
.
define
(
`vscode
${
dashed
(
platform
)}${
dashed
(
arch
)}${
dashed
(
minified
)}
`
,
task
.
series
(
compileBuildTask
,
compileExtensionsBuildTask
,
minified
?
minifyVSCodeTask
:
optimizeVSCodeTask
,
vscodeTaskCI
));
gulp
.
task
(
vscodeTask
);
...
...
package.json
浏览文件 @
ef893f0c
{
"name"
:
"code-oss-dev"
,
"version"
:
"1.37.0"
,
"distro"
:
"
65898cd4327756aaf3f5e65f02d0e1edee2db1a9
"
,
"distro"
:
"
232f54dd8c50f5bdf086c2c557a42954a41170bd
"
,
"author"
:
{
"name"
:
"Microsoft Corporation"
},
...
...
@@ -156,4 +156,4 @@
"windows-mutex"
:
"0.2.1"
,
"windows-process-tree"
:
"0.2.3"
}
}
\ No newline at end of file
}
src/vs/workbench/services/keybinding/browser/keybindingService.ts
浏览文件 @
ef893f0c
...
...
@@ -532,7 +532,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
mightProducePrintableCharacter
(
event
:
IKeyboardEvent
):
boolean
{
if
(
event
.
ctrlKey
||
event
.
metaKey
||
event
.
altKey
)
{
// ignore ctrl/cmd
/alt-combination but not shif
t-combinatios
// ignore ctrl/cmd
-combination but not shift/al
t-combinatios
return
false
;
}
const
code
=
ScanCodeUtils
.
toEnum
(
event
.
code
);
...
...
src/vs/workbench/services/textfile/test/textFileService.io.test.ts
浏览文件 @
ef893f0c
...
...
@@ -247,10 +247,7 @@ suite('Files - TextFileService i/o', () => {
}
test
(
'
write - use encoding (cp1252)
'
,
async
()
=>
{
const
filePath
=
join
(
testDir
,
'
some_cp1252.txt
'
);
const
contents
=
await
readFile
(
filePath
,
'
utf8
'
);
const
eol
=
/
\r\n
/
.
test
(
contents
)
?
'
\r\n
'
:
'
\n
'
;
await
testEncodingKeepsData
(
URI
.
file
(
filePath
),
'
cp1252
'
,
[
'
ObjectCount = LoadObjects("Öffentlicher Ordner");
'
,
''
,
'
Private = "Persönliche Information"
'
,
''
].
join
(
eol
));
await
testEncodingKeepsData
(
URI
.
file
(
join
(
testDir
,
'
some_cp1252.txt
'
)),
'
cp1252
'
,
[
'
ObjectCount = LoadObjects("Öffentlicher Ordner");
'
,
''
,
'
Private = "Persönliche Information"
'
,
''
].
join
(
isWindows
?
'
\r\n
'
:
'
\n
'
));
});
test
(
'
write - use encoding (shiftjis)
'
,
async
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录