Merge pull request #947 from arkhi/ci

Fix editorconfig greediness
This commit is contained in:
Mouse Reeve 2021-04-17 12:12:02 -07:00 committed by GitHub
commit 53e11051d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions

View file

@ -23,6 +23,7 @@ max_line_length = off
[*.{csv,json,html,md,po,py,svg,tsv}] [*.{csv,json,html,md,po,py,svg,tsv}]
max_line_length = off max_line_length = off
# ` ` at the end of a line is a line-break in markdown
[*.{md,markdown}] [*.{md,markdown}]
trim_trailing_whitespace = false trim_trailing_whitespace = false
@ -30,7 +31,9 @@ trim_trailing_whitespace = false
indent_size = 2 indent_size = 2
max_line_length = off max_line_length = off
[{package.json,yarn.lock}] # Computer generated files
[{package.json,*.lock,*.mo}]
indent_size = unset indent_size = unset
indent_style = unset indent_style = unset
max_line_length = unset max_line_length = unset
insert_final_newline = unset

View file

@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it.
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install modules - name: Install modules
@ -26,8 +26,13 @@ jobs:
# See .stylelintignore for files that are not linted. # See .stylelintignore for files that are not linted.
- name: Run stylelint - name: Run stylelint
run: yarn stylelint bookwyrm/static/**/*.css --report-needless-disables --report-invalid-scope-disables run: >
yarn stylelint bookwyrm/static/**/*.css \
--report-needless-disables \
--report-invalid-scope-disables
# See .eslintignore for files that are not linted. # See .eslintignore for files that are not linted.
- name: Run ESLint - name: Run ESLint
run: yarn eslint bookwyrm/static --ext .js,.jsx,.ts,.tsx run: >
yarn eslint bookwyrm/static \
--ext .js,.jsx,.ts,.tsx