Skip to content

Commit 4e3ce68

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/scm-view-service
2 parents 4c79694 + 5e4f1b0 commit 4e3ce68

81 files changed

Lines changed: 644 additions & 885 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/classifier.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
33
"assignees": {
4+
"joaomoreno": {"accuracy": 1.5},
45
"JacksonKearl": {"accuracy": 0.5}
56
},
67
"labels": {
@@ -71,10 +72,10 @@
7172
"file-watcher": {"assign": ["bpasero"]},
7273
"font-rendering": {"assign": []},
7374
"formatting": {"assign": []},
74-
"git": {"assign": ["joaomoreno"]},
75+
"git": {"assign": ["joaomoreno"], "accuracy": 1.5},
7576
"gpu": {"assign": ["deepak1556"]},
7677
"grammar": {"assign": ["mjbvz"]},
77-
"grid-view": {"assign": ["joaomoreno"]},
78+
"grid-view": {"assign": ["joaomoreno"], "accuracy": 1.5},
7879
"html": {"assign": ["aeschli"]},
7980
"i18n": {"assign": []},
8081
"icon-brand": {"assign": []},
@@ -85,7 +86,7 @@
8586
"integrated-terminal-links": {"assign": ["Tyriar"]},
8687
"integration-test": {"assign": []},
8788
"intellisense-config": {"assign": []},
88-
"ipc": {"assign": ["joaomoreno"]},
89+
"ipc": {"assign": ["joaomoreno"], "accuracy": 1.5},
8990
"issue-bot": {"assign": ["chrmarti"]},
9091
"issue-reporter": {"assign": ["RMacfarlane"]},
9192
"javascript": {"assign": ["mjbvz"]},
@@ -97,7 +98,7 @@
9798
"languages-diagnostics": {"assign": ["jrieken"]},
9899
"layout": {"assign": ["sbatten"]},
99100
"lcd-text-rendering": {"assign": []},
100-
"list": {"assign": ["joaomoreno"]},
101+
"list": {"assign": ["joaomoreno"], "accuracy": 1.5},
101102
"log": {"assign": []},
102103
"markdown": {"assign": ["mjbvz"]},
103104
"marketplace": {"assign": []},
@@ -110,15 +111,15 @@
110111
"perf-bloat": {"assign": []},
111112
"perf-startup": {"assign": []},
112113
"php": {"assign": ["roblourens"]},
113-
"portable-mode": {"assign": ["joaomoreno"]},
114+
"portable-mode": {"assign": ["joaomoreno"], "accuracy": 1.5},
114115
"proxy": {"assign": []},
115116
"quick-pick": {"assign": ["chrmarti"]},
116117
"references-viewlet": {"assign": ["jrieken"]},
117118
"release-notes": {"assign": []},
118119
"remote": {"assign": []},
119120
"remote-explorer": {"assign": ["alexr00"]},
120121
"rename": {"assign": ["jrieken"]},
121-
"scm": {"assign": ["joaomoreno"]},
122+
"scm": {"assign": ["joaomoreno"], "accuracy": 1.5},
122123
"screencast-mode": {"assign": ["lszomoru"]},
123124
"search": {"assign": ["roblourens"]},
124125
"search-editor": {"assign": ["JacksonKearl"]},
@@ -129,9 +130,9 @@
129130
"simple-file-dialog": {"assign": ["alexr00"]},
130131
"smart-select": {"assign": ["jrieken"]},
131132
"smoke-test": {"assign": []},
132-
"snap": {"assign": ["joaomoreno"]},
133+
"snap": {"assign": ["joaomoreno"], "accuracy": 1.5},
133134
"snippets": {"assign": ["jrieken"]},
134-
"splitview": {"assign": ["joaomoreno"]},
135+
"splitview": {"assign": ["joaomoreno"], "accuracy": 1.5},
135136
"suggest": {"assign": ["jrieken"]},
136137
"tasks": {"assign": ["alexr00"]},
137138
"telemetry": {"assign": []},
@@ -140,7 +141,7 @@
140141
"timeline-git": {"assign": ["eamodio"]},
141142
"titlebar": {"assign": ["sbatten"]},
142143
"tokenization": {"assign": []},
143-
"tree": {"assign": ["joaomoreno"]},
144+
"tree": {"assign": ["joaomoreno"], "accuracy": 1.5},
144145
"typescript": {"assign": ["mjbvz"]},
145146
"undo-redo": {"assign": []},
146147
"unit-test": {"assign": []},

‎.github/workflows/deep-classifier-runner.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "Deep Classifier: Runner"
22
on:
33
schedule:
4-
- cron: 0/30 * * * *
4+
- cron: 0 * * * *
55
repository_dispatch:
66
types: [trigger-deep-classifier-runner]
77

@@ -24,7 +24,7 @@ jobs:
2424
uses: ./actions/classifier-deep/apply/fetch-sources
2525
with:
2626
# slightly overlapping to protect against issues slipping through the cracks if a run is delayed
27-
from: 40
27+
from: 80
2828
until: 5
2929
configPath: classifier
3030
blobContainerName: vscode-issue-classifier

‎.vscode/searches/es6.code-search‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ src/vs/base/common/arrays.ts:
3434
420 */
3535
421 export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
3636

37-
569
38-
570 /**
39-
571: * @deprecated ES6: use `Array.find`
40-
572 */
41-
573 export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
37+
568
38+
569 /**
39+
570: * @deprecated ES6: use `Array.find`
40+
571 */
41+
572 export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
4242

4343
src/vs/base/common/objects.ts:
4444
115

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ steps:
5050
displayName: Run Unit Tests (Electron)
5151

5252
- script: |
53-
yarn test-browser --browser chromium --browser webkit --browser firefox
53+
yarn test-browser --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
5454
displayName: Run Unit Tests (Browser)
5555

5656
- script: |

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ steps:
101101

102102
- script: |
103103
set -e
104-
yarn test-browser --build --browser chromium --browser webkit --browser firefox
104+
yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
105105
displayName: Run unit tests (Browser)
106106
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
107107

@@ -160,6 +160,13 @@ steps:
160160
continueOnError: true
161161
condition: failed()
162162

163+
- task: PublishTestResults@2
164+
displayName: Publish Tests Results
165+
inputs:
166+
testResultsFiles: '*-results.xml'
167+
searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
168+
condition: succeededOrFailed()
169+
163170
- script: |
164171
set -e
165172
security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ steps:
6363
displayName: Run Unit Tests (Electron)
6464

6565
- script: |
66-
DISPLAY=:10 yarn test-browser --browser chromium
66+
DISPLAY=:10 yarn test-browser --browser chromium --tfs "Browser Unit Tests"
6767
displayName: Run Unit Tests (Browser)
6868

6969
- script: |

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ steps:
106106

107107
- script: |
108108
set -e
109-
DISPLAY=:10 yarn test-browser --build --browser chromium
109+
DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
110110
displayName: Run unit tests (Browser)
111111
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
112112

@@ -148,6 +148,13 @@ steps:
148148
continueOnError: true
149149
condition: failed()
150150

151+
- task: PublishTestResults@2
152+
displayName: Publish Tests Results
153+
inputs:
154+
testResultsFiles: '*-results.xml'
155+
searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
156+
condition: succeededOrFailed()
157+
151158
- script: |
152159
set -e
153160
yarn gulp "vscode-linux-x64-build-deb"

0 commit comments

Comments
 (0)