Skip to content

Commit 11e3aa2

Browse files
authored
Merge pull request #3709 from github/aeisenberg/eslint-sarif
Upload ESLint results to code scanning
2 parents 7907d8d + 0a90b45 commit 11e3aa2

File tree

3 files changed

+48
-7
lines changed

3 files changed

+48
-7
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ jobs:
7979
run: |
8080
npm run check-types
8181
82-
- name: Lint
83-
working-directory: extensions/ql-vscode
84-
env:
85-
NODE_OPTIONS: '--max-old-space-size=4096'
86-
run: |
87-
npm run lint
88-
8982
- name: Lint Markdown
9083
working-directory: extensions/ql-vscode
9184
run: |
@@ -101,6 +94,21 @@ jobs:
10194
run: |
10295
npm run find-deadcode
10396
97+
- name: Lint
98+
if: "${{ !cancelled() }}"
99+
working-directory: extensions/ql-vscode
100+
env:
101+
NODE_OPTIONS: '--max-old-space-size=4096'
102+
run: |
103+
npm run lint-ci
104+
105+
- name: Upload ESLint results to Code Scanning
106+
if: "${{ !cancelled() }}"
107+
uses: github/codeql-action/upload-sarif@main
108+
with:
109+
sarif_file: extensions/ql-vscode/build/eslint.sarif
110+
category: eslint
111+
104112
generated:
105113
name: Check generated code
106114
runs-on: ubuntu-latest

extensions/ql-vscode/package-lock.json

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,7 @@
19531953
"update-vscode": "node ./node_modules/vscode/bin/install",
19541954
"format": "prettier --write **/*.{ts,tsx} && eslint . --ext .ts,.tsx --fix",
19551955
"lint": "eslint . --ext .js,.ts,.tsx --max-warnings=0",
1956+
"lint-ci": "SARIF_ESLINT_IGNORE_SUPPRESSED=true eslint . --ext .js,.ts,.tsx --max-warnings=0 --format @microsoft/eslint-formatter-sarif --output-file=build/eslint.sarif",
19561957
"lint:markdown": "markdownlint-cli2 \"../../**/*.{md,mdx}\" \"!**/node_modules/**\" \"!**/.vscode-test/**\" \"!**/build/cli/v*/**\"",
19571958
"find-deadcode": "vite-node scripts/find-deadcode.ts",
19581959
"format-staged": "lint-staged",
@@ -2010,6 +2011,7 @@
20102011
"@babel/preset-typescript": "^7.21.4",
20112012
"@faker-js/faker": "^8.4.1",
20122013
"@github/markdownlint-github": "^0.6.2",
2014+
"@microsoft/eslint-formatter-sarif": "^3.1.0",
20132015
"@playwright/test": "^1.40.1",
20142016
"@storybook/addon-a11y": "^8.3.0",
20152017
"@storybook/addon-actions": "^8.3.0",

0 commit comments

Comments
 (0)