Skip to content

Commit

Permalink
Merge branch 'master' into issue-5740-re-arrange-processing-of-newlines
Browse files Browse the repository at this point in the history
  • Loading branch information
martgil authored May 28, 2024
2 parents 32d2dc2 + 4252b8b commit 5af7a45
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 61 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# ESLint is a tool for identifying and reporting on patterns
# found in ECMAScript/JavaScript code.
# More details at https://github.com/eslint/eslint
# and https://eslint.org

name: ESLint

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
eslint:
name: Run eslint scanning
runs-on: ubuntu-latest
permissions:
contents: read
security-events: write
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps:
- name: Checkout code
uses: actions/checkout@v4
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
with:
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

- name: Install ESLint
run: |
npm install @microsoft/[email protected]
npm ci --ignore-scripts
- name: Run ESLint
run: SARIF_ESLINT_IGNORE_SUPPRESSED=true npm run test_eslint_ci
continue-on-error: true

- name: Upload analysis results to GitHub
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: eslint-results.sarif
wait-for-processing: true
61 changes: 0 additions & 61 deletions .github/workflows/ossar-analysis.yml

This file was deleted.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"test_local_chrome_consumer_mock_headless": "xvfb-run npm run test_local_chrome_consumer_mock",
"test_stylelint": "stylelint extension/css/cryptup.css extension/css/settings.css extension/css/webmail.css && stylelint extension/**/*.htm --custom-syntax postcss-html",
"test_eslint": "eslint --ext ts extension test tooling",
"test_eslint_ci": "npm run test_eslint -- --format @microsoft/eslint-formatter-sarif --output-file eslint-results.sarif",
"test_patterns": "node build/test/test/source/patterns.js",
"test_async_stack": "node build/test/test/source/async-stack.js",
"test_buf": "npx ava --timeout=3m --verbose --concurrency=10 build/test/test/source/buf.js",
Expand Down

0 comments on commit 5af7a45

Please sign in to comment.