Merge branch 'main' into dependabot/npm_and_yarn/extensions/ql-vscode…

…/typescript-eslint-915606451e
github · Sep 25, 2024 · abbe597 · abbe597
2 parents 15a3f36 + b6b707e
commit abbe597
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -103,7 +103,7 @@ jobs:
           npm run lint-ci
 
       - name: Upload ESLint results to Code Scanning
-        if: "${{ !cancelled() }}"
+        if: "${{ !cancelled() && !startsWith(github.head_ref, 'dependabot/')}}"
         uses: github/codeql-action/upload-sarif@main
         with:
           sarif_file: extensions/ql-vscode/build/eslint.sarif

diff --git a/extensions/ql-vscode/test/vscode-tests/activated-extension/jest.setup.ts b/extensions/ql-vscode/test/vscode-tests/activated-extension/jest.setup.ts
@@ -6,7 +6,7 @@ import {
 
 beforeAll(async () => {
   await beforeAllAction();
-});
+}, 20_000);
 
 beforeEach(async () => {
   await beforeEachAction();