Skip to content

Commit 5d6a46c

Browse files
jriekenjrieken
authored
Merge branch 'master' into joh/completionOverwrite
2 parents 9f474fe + b059cbd commit 5d6a46c

269 files changed

Lines changed: 25547 additions & 23204 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.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
css-less-scss: [],
1616
debug-console: [],
1717
debug: {
18-
assignees: [ isidorn ],
18+
assignees: [ weinand ],
1919
assignLabel: false
2020
},
2121
diff-editor: : {

‎.github/workflows/ci.yml‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
linux:
7+
runs-on: ubuntu-latest
8+
env:
9+
CHILD_CONCURRENCY: "1"
10+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11+
steps:
12+
- uses: actions/checkout@v1
13+
# TODO: rename azure-pipelines/linux/xvfb.init to github-actions
14+
- run: |
15+
sudo apt-get update
16+
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0
17+
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
18+
sudo chmod +x /etc/init.d/xvfb
19+
sudo update-rc.d xvfb defaults
20+
sudo service xvfb start
21+
name: Setup Build Environment
22+
- uses: actions/setup-node@v1
23+
with:
24+
node-version: 10
25+
# TODO: cache node modules
26+
- run: yarn --frozen-lockfile
27+
name: Install Dependencies
28+
- run: yarn electron x64
29+
name: Download Electron
30+
- run: yarn gulp hygiene --skip-tslint
31+
name: Run Hygiene Checks
32+
- run: yarn gulp tslint
33+
name: Run TSLint Checks
34+
- run: yarn monaco-compile-check
35+
name: Run Monaco Editor Checks
36+
- run: yarn compile
37+
name: Compile Sources
38+
- run: yarn download-builtin-extensions
39+
name: Download Built-in Extensions
40+
- run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
41+
name: Run Unit Tests
42+
- run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
43+
name: Run Integration Tests
44+
45+
windows:
46+
runs-on: windows-2016
47+
env:
48+
CHILD_CONCURRENCY: "1"
49+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
steps:
51+
- uses: actions/checkout@v1
52+
- uses: actions/setup-node@v1
53+
with:
54+
node-version: 10
55+
- uses: actions/setup-python@v1
56+
with:
57+
python-version: '2.x'
58+
- run: yarn --frozen-lockfile
59+
name: Install Dependencies
60+
- run: yarn electron
61+
name: Download Electron
62+
- run: yarn gulp hygiene --skip-tslint
63+
name: Run Hygiene Checks
64+
- run: yarn gulp tslint
65+
name: Run TSLint Checks
66+
- run: yarn monaco-compile-check
67+
name: Run Monaco Editor Checks
68+
- run: yarn compile
69+
name: Compile Sources
70+
- run: yarn download-builtin-extensions
71+
name: Download Built-in Extensions
72+
- run: .\scripts\test.bat --tfs "Unit Tests"
73+
name: Run Unit Tests
74+
- run: .\scripts\test-integration.bat --tfs "Integration Tests"
75+
name: Run Integration Tests
76+
77+
darwin:
78+
runs-on: macos-latest
79+
env:
80+
CHILD_CONCURRENCY: "1"
81+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
steps:
83+
- uses: actions/checkout@v1
84+
- uses: actions/setup-node@v1
85+
with:
86+
node-version: 10
87+
- run: yarn --frozen-lockfile
88+
name: Install Dependencies
89+
- run: yarn electron x64
90+
name: Download Electron
91+
- run: yarn gulp hygiene --skip-tslint
92+
name: Run Hygiene Checks
93+
- run: yarn gulp tslint
94+
name: Run TSLint Checks
95+
- run: yarn monaco-compile-check
96+
name: Run Monaco Editor Checks
97+
- run: yarn compile
98+
name: Compile Sources
99+
- run: yarn download-builtin-extensions
100+
name: Download Built-in Extensions
101+
- run: ./scripts/test.sh --tfs "Unit Tests"
102+
name: Run Unit Tests
103+
- run: ./scripts/test-integration.sh --tfs "Integration Tests"
104+
name: Run Integration Tests

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@
123123
"request": "launch",
124124
"name": "Launch VS Code",
125125
"windows": {
126-
"runtimeExecutable": "${workspaceFolder}/scripts/code.bat",
127-
"timeout": 20000
126+
"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
128127
},
129128
"osx": {
130129
"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
131130
},
132131
"linux": {
133132
"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
134133
},
134+
"timeout": 20000,
135135
"env": {
136136
"VSCODE_EXTHOST_WILL_SEND_SOCKET": null
137137
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
inputs:
1212
versionSpec: "1.x"
1313
- script: |
14-
yarn --frozen-lockfile
14+
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
1515
displayName: Install Dependencies
1616
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
1717
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
inputs:
2020
versionSpec: "1.x"
2121
- script: |
22-
yarn --frozen-lockfile
22+
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
2323
displayName: Install Dependencies
2424
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2525
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ steps:
1616
vstsFeed: '$(ArtifactFeed)'
1717
- powershell: |
1818
yarn --frozen-lockfile
19+
env:
20+
CHILD_CONCURRENCY: "1"
1921
displayName: Install Dependencies
2022
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2123
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1

‎extensions/cpp/cgmanifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "jeff-hykin/cpp-textmate-grammar",
88
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
9-
"commitHash": "dd94b6a93799f2bce7e29b2515d96553e34574b0"
9+
"commitHash": "aacc3b93c9e917271969c49cbcecf3f08e209c47"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.14.6",
13+
"version": "1.14.9",
1414
"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
1515
},
1616
{
@@ -42,4 +42,4 @@
4242
}
4343
],
4444
"version": 1
45-
}
45+
}

0 commit comments

Comments
 (0)