Skip to content

Commit

Permalink
chore: adjust make commands and change usage in ci
Browse files Browse the repository at this point in the history
make lint now runs prettier and eslint together, allowing both to error independently, make format
will now fix any autofixable issues in eslint and run prettier, eslint can fail and prettier will
still run.

In CI we now also run the lint as we want CI to fail if there's issues, not fix them silently but
not inform us
  • Loading branch information
ewanharris committed Feb 14, 2024
1 parent f23ec61 commit ad951c4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/main-js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ jobs:
- name: Audit dependencies
run: make audit-js

- name: Run Prettier
run: make format-js

- name: Run eslint
- name: Run eslint and prettier
run: make lint-js

build:
Expand Down
4 changes: 2 additions & 2 deletions pkg/js/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ test: init-deps
npm run test

lint: init-deps
npm run lint
npm run lint;npm run format:check

audit: init-deps
npm audit

format: init-deps
npm run format:fix
npm run lint:fix;npm run format:fix

all-tests: audit lint test
npx madge --circular --exclude '^dist|^gen' . --extensions ts,js

0 comments on commit ad951c4

Please sign in to comment.