From a5f597cacfa2b9d693fc7ddabd1318aa07aada90 Mon Sep 17 00:00:00 2001 From: Mike Bostock Date: Mon, 16 Jan 2023 11:21:55 -0800 Subject: [PATCH] combine prettier into main workflow --- .github/workflows/node.js.yml | 3 ++- .github/workflows/prettier.yml | 23 ----------------------- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/prettier.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3d48381c7e..4cbdf100f7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -25,7 +25,8 @@ jobs: - run: yarn --frozen-lockfile - run: | echo ::add-matcher::.github/eslint.json - yarn run eslint . --format=compact + yarn run eslint src test --format=compact + - run: yarn run prettier --check src test - run: yarn test - name: Test artifacts uses: actions/upload-artifact@v3 diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml deleted file mode 100644 index 3523246606..0000000000 --- a/.github/workflows/prettier.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Formatting - -on: - pull_request: - branches: [main] - -jobs: - prettier: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - # Make sure the actual branch is checked out when running on pull requests - ref: ${{ github.head_ref }} - # This is important to fetch the changes to the previous commit - fetch-depth: 0 - - - name: Check prettier - uses: creyD/prettier_action@v4.2 - with: - prettier_options: --check .