Skip to content

Commit 13f8cb7

Browse files
sandy081sandy081
authored
Merge branch 'master' into sandy081/delaySpdlog
2 parents 61a21bf + c6ce623 commit 13f8cb7

26 files changed

Lines changed: 227 additions & 63 deletions

File tree

‎.vscode/launch.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,25 @@
229229
"order": 2
230230
}
231231
},
232+
{
233+
"type": "node",
234+
"request": "launch",
235+
"name": "Main Process",
236+
"runtimeExecutable": "${workspaceFolder}/scripts/code.sh",
237+
"windows": {
238+
"runtimeExecutable": "${workspaceFolder}/scripts/code.bat",
239+
},
240+
"runtimeArgs": [
241+
"--no-cached-data"
242+
],
243+
"outFiles": [
244+
"${workspaceFolder}/out/**/*.js"
245+
],
246+
"presentation": {
247+
"group": "1_vscode",
248+
"order": 1
249+
}
250+
},
232251
{
233252
"type": "chrome",
234253
"request": "launch",

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,72 @@ steps:
22
- task: NodeTool@0
33
inputs:
44
versionSpec: "12.13.0"
5+
56
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
67
inputs:
78
versionSpec: "1.x"
9+
810
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
911
inputs:
1012
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1113
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
1214
vstsFeed: 'vscode-build-cache'
15+
1316
- script: |
1417
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
1518
displayName: Install Dependencies
1619
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
20+
1721
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
1822
inputs:
1923
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2024
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2125
vstsFeed: 'vscode-build-cache'
2226
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
27+
2328
- script: |
2429
yarn electron x64
2530
displayName: Download Electron
31+
2632
- script: |
2733
yarn gulp hygiene
2834
displayName: Run Hygiene Checks
35+
2936
- script: |
3037
yarn monaco-compile-check
3138
displayName: Run Monaco Editor Checks
39+
3240
- script: |
3341
yarn valid-layers-check
3442
displayName: Run Valid Layers Checks
43+
3544
- script: |
3645
yarn compile
3746
displayName: Compile Sources
47+
3848
- script: |
3949
yarn download-builtin-extensions
4050
displayName: Download Built-in Extensions
51+
4152
- script: |
4253
./scripts/test.sh --tfs "Unit Tests"
4354
displayName: Run Unit Tests (Electron)
55+
4456
- script: |
4557
yarn test-browser --browser chromium --browser webkit --browser firefox
4658
displayName: Run Unit Tests (Browser)
59+
4760
- script: |
4861
./scripts/test-integration.sh --tfs "Integration Tests"
4962
displayName: Run Integration Tests (Electron)
63+
64+
- task: PublishPipelineArtifact@0
65+
inputs:
66+
artifactName: crash-dump-macos
67+
targetPath: .build/crashes
68+
displayName: 'Publish Crash Reports'
69+
condition: succeededOrFailed()
70+
5071
- task: PublishTestResults@2
5172
displayName: Publish Tests Results
5273
inputs:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@ steps:
152152
displayName: Run smoke tests (Browser)
153153
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
154154

155+
- task: PublishPipelineArtifact@0
156+
inputs:
157+
artifactName: crash-dump-macos
158+
targetPath: .build/crashes
159+
displayName: 'Publish Crash Reports'
160+
condition: succeededOrFailed()
161+
155162
- script: |
156163
set -e
157164
security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,76 @@ steps:
77
sudo chmod +x /etc/init.d/xvfb
88
sudo update-rc.d xvfb defaults
99
sudo service xvfb start
10+
1011
- task: NodeTool@0
1112
inputs:
1213
versionSpec: "12.13.0"
14+
1315
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
1416
inputs:
1517
versionSpec: "1.x"
18+
1619
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
1720
inputs:
1821
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1922
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2023
vstsFeed: 'vscode-build-cache'
24+
2125
- script: |
2226
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
2327
displayName: Install Dependencies
2428
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
29+
2530
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2631
inputs:
2732
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2833
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2934
vstsFeed: 'vscode-build-cache'
3035
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
36+
3137
- script: |
3238
yarn electron x64
3339
displayName: Download Electron
40+
3441
- script: |
3542
yarn gulp hygiene
3643
displayName: Run Hygiene Checks
44+
3745
- script: |
3846
yarn monaco-compile-check
3947
displayName: Run Monaco Editor Checks
48+
4049
- script: |
4150
yarn valid-layers-check
4251
displayName: Run Valid Layers Checks
52+
4353
- script: |
4454
yarn compile
4555
displayName: Compile Sources
56+
4657
- script: |
4758
yarn download-builtin-extensions
4859
displayName: Download Built-in Extensions
60+
4961
- script: |
5062
DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
5163
displayName: Run Unit Tests (Electron)
64+
5265
- script: |
5366
DISPLAY=:10 yarn test-browser --browser chromium
5467
displayName: Run Unit Tests (Browser)
68+
5569
- script: |
5670
DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
5771
displayName: Run Integration Tests (Electron)
72+
73+
- task: PublishPipelineArtifact@0
74+
inputs:
75+
artifactName: crash-dump-linux
76+
targetPath: .build/crashes
77+
displayName: 'Publish Crash Reports'
78+
condition: succeededOrFailed()
79+
5880
- task: PublishTestResults@2
5981
displayName: Publish Tests Results
6082
inputs:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ steps:
140140
displayName: Run integration tests (Browser)
141141
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
142142

143+
- task: PublishPipelineArtifact@0
144+
inputs:
145+
artifactName: crash-dump-linux
146+
targetPath: .build/crashes
147+
displayName: 'Publish Crash Reports'
148+
condition: succeededOrFailed()
149+
143150
- script: |
144151
set -e
145152
yarn gulp "vscode-linux-x64-build-deb"

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,78 @@ steps:
22
- task: NodeTool@0
33
inputs:
44
versionSpec: "12.13.0"
5+
56
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
67
inputs:
78
versionSpec: "1.x"
9+
810
- task: UsePythonVersion@0
911
inputs:
1012
versionSpec: '2.x'
1113
addToPath: true
14+
1215
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
1316
inputs:
1417
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1518
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
1619
vstsFeed: 'vscode-build-cache'
20+
1721
- powershell: |
1822
yarn --frozen-lockfile
1923
env:
2024
CHILD_CONCURRENCY: "1"
2125
displayName: Install Dependencies
2226
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
27+
2328
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2429
inputs:
2530
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2631
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2732
vstsFeed: 'vscode-build-cache'
2833
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
34+
2935
- powershell: |
3036
yarn electron
37+
3138
- script: |
3239
yarn gulp hygiene
3340
displayName: Run Hygiene Checks
41+
3442
- powershell: |
3543
yarn monaco-compile-check
3644
displayName: Run Monaco Editor Checks
45+
3746
- script: |
3847
yarn valid-layers-check
3948
displayName: Run Valid Layers Checks
49+
4050
- powershell: |
4151
yarn compile
4252
displayName: Compile Sources
53+
4354
- powershell: |
4455
yarn download-builtin-extensions
4556
displayName: Download Built-in Extensions
57+
4658
- powershell: |
4759
.\scripts\test.bat --tfs "Unit Tests"
4860
displayName: Run Unit Tests (Electron)
61+
4962
- powershell: |
5063
yarn test-browser --browser chromium --browser firefox
5164
displayName: Run Unit Tests (Browser)
65+
5266
- powershell: |
5367
.\scripts\test-integration.bat --tfs "Integration Tests"
5468
displayName: Run Integration Tests (Electron)
69+
70+
- task: PublishPipelineArtifact@0
71+
displayName: 'Publish Crash Reports'
72+
inputs:
73+
artifactName: crash-dump-windows
74+
targetPath: .build\crashes
75+
condition: succeededOrFailed()
76+
5577
- task: PublishTestResults@2
5678
displayName: Publish Tests Results
5779
inputs:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,13 @@ steps:
149149
displayName: Run integration tests (Browser)
150150
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
151151

152+
- task: PublishPipelineArtifact@0
153+
inputs:
154+
artifactName: crash-dump-windows-$(VSCODE_ARCH)
155+
targetPath: .build\crashes
156+
displayName: 'Publish Crash Reports'
157+
condition: succeededOrFailed()
158+
152159
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
153160
inputs:
154161
ConnectedServiceName: 'ESRP CodeSign'

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.46.0",
4-
"distro": "d6a1acad6b868ff4705a082931c37f8ea24b4ba9",
4+
"distro": "ce946b3269a7188e873f31dd642911089c3e03e7",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -55,7 +55,7 @@
5555
"sudo-prompt": "9.1.1",
5656
"v8-inspect-profiler": "^0.0.20",
5757
"vscode-nsfw": "1.2.8",
58-
"vscode-oniguruma": "1.3.0",
58+
"vscode-oniguruma": "1.3.1",
5959
"vscode-proxy-agent": "^0.5.2",
6060
"vscode-ripgrep": "^1.5.8",
6161
"vscode-sqlite3": "4.0.10",

‎remote/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"semver-umd": "^5.5.6",
1717
"spdlog": "^0.11.1",
1818
"vscode-nsfw": "1.2.8",
19-
"vscode-oniguruma": "1.3.0",
19+
"vscode-oniguruma": "1.3.1",
2020
"vscode-proxy-agent": "^0.5.2",
2121
"vscode-ripgrep": "^1.5.8",
2222
"vscode-textmate": "5.1.1",

‎remote/web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"dependencies": {
55
"semver-umd": "^5.5.6",
6-
"vscode-oniguruma": "1.3.0",
6+
"vscode-oniguruma": "1.3.1",
77
"vscode-textmate": "5.1.1",
88
"xterm": "4.6.0-beta.44",
99
"xterm-addon-search": "0.7.0-beta.2",

0 commit comments

Comments
 (0)