Skip to content

Commit ad50d76

Browse files
authored
Merge branch 'main' into dependabot/github_actions/dot-github/actions/build-vsix/actions/setup-node-6
2 parents 5549ed2 + e19c6bb commit ad50d76

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v3
45+
uses: github/codeql-action/init@v4
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,4 +67,4 @@ jobs:
6767
# make release
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v3
70+
uses: github/codeql-action/analyze@v4

src/test/standardTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ async function start() {
8989
console.log('VS Code executable', vscodeExecutablePath);
9090
const launchArgs = baseLaunchArgs
9191
.concat([workspacePath])
92-
.concat(channel === 'insiders' ? ['--enable-proposed-api'] : [])
92+
.concat(['--enable-proposed-api'])
9393
.concat(['--timeout', '5000']);
9494
console.log(`Starting vscode ${channel} with args ${launchArgs.join(' ')}`);
9595
const options: TestOptions = {

0 commit comments

Comments
 (0)