diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8135066..c1da375 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,5 @@ jobs: - run: yarn install --immutable - name: Compile run: yarn build - - name: Run eslint - run: yarn lint - - name: Run prettier - uses: actionsx/prettier@v2 + - name: Run prettier and eslint + run: yarn lint-ci diff --git a/package.json b/package.json index a319086..153e81e 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "lint": "echo 'Style checking...'; prettier --check .; echo 'Linting...'; eslint src; echo 'To auto-fix everything possible, please run `yarn lint-fix`'; true", "lint-fix": "echo 'Fixing eslint issues...'; eslint src --fix; echo 'Reformatting...'; prettier --write --loglevel warn --cache .; true", "lint-list": "echo 'Style checking...'; prettier --check .; echo 'Linting...'; eslint src; echo 'To view errors in more detail, please run `yarn lint`'; true", + "lint-ci" : "echo 'Style checking...' && prettier --check . && echo 'Linting...' && eslint src", "setup": "node Installer.js", "win-force-build": "clear | rm -r dist | tsc-suppress" },