Skip to content

Commit e2e4879

Browse files
committed
Merge remote-tracking branch 'origin/main' into koesie10/typecheck-everything
2 parents cac7c3a + 7dedfca commit e2e4879

File tree

23 files changed

+1183
-671
lines changed

23 files changed

+1183
-671
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
cp dist/*.vsix artifacts
4848
4949
- name: Upload artifacts
50-
uses: actions/upload-artifact@v2
50+
uses: actions/upload-artifact@v3
5151
if: matrix.os == 'ubuntu-latest'
5252
with:
5353
name: vscode-codeql-extension
@@ -190,7 +190,7 @@ jobs:
190190
strategy:
191191
matrix:
192192
os: [ubuntu-latest, windows-latest]
193-
version: ['v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.4', 'nightly']
193+
version: ['v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.5', 'nightly']
194194
fail-fast: false
195195
env:
196196
CLI_VERSION: ${{ matrix.version }}

.vscode/settings.json

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,28 @@
4242
"LANG": "en-US",
4343
"TZ": "UTC"
4444
},
45-
// Uncomment to debug integration tests
46-
// "jestrunner.debugOptions": {
47-
// "attachSimplePort": 9223,
48-
// "env": {
49-
// "VSCODE_WAIT_FOR_DEBUGGER": "true",
50-
// }
51-
// },
45+
"jestrunner.debugOptions": {
46+
// Uncomment to debug integration tests
47+
// "attachSimplePort": 9223,
48+
"env": {
49+
"LANG": "en-US",
50+
"TZ": "UTC",
51+
// Uncomment to debug integration tests
52+
// "VSCODE_WAIT_FOR_DEBUGGER": "true",
53+
}
54+
},
55+
"terminal.integrated.env.linux": {
56+
"LANG": "en-US",
57+
"TZ": "UTC"
58+
},
59+
"terminal.integrated.env.osx": {
60+
"LANG": "en-US",
61+
"TZ": "UTC"
62+
},
63+
"terminal.integrated.env.windows": {
64+
"LANG": "en-US",
65+
"TZ": "UTC"
66+
},
5267
"[typescript]": {
5368
"editor.defaultFormatter": "esbenp.prettier-vscode",
5469
"editor.formatOnSave": true,

0 commit comments

Comments
 (0)