diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 23844b4..1dedb51 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -18,7 +18,7 @@ jobs: npm run build npm link npm link eslint-plugin-jest-dom - - uses: AriPerkkio/eslint-remote-tester-run-action@v3 + - uses: AriPerkkio/eslint-remote-tester-run-action@v4 with: issue-title: "Results of weekly scheduled smoke test" eslint-remote-tester-config: smoke-test/eslint-remote-tester.config.js diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 5f3b97b..8ac35e7 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -9,7 +9,12 @@ on: - "beta" - "alpha" - "!all-contributors/**" - pull_request: {} + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: main: # ignore all-contributors PRs @@ -19,11 +24,14 @@ jobs: matrix: eslint: [6.8.0, 6, 7.0.0, 7, 8.0.0, 8] node: [12.22.0, 12, 14.17.0, 14, 16.0.0, 16] + testing-library-dom: [8, 9] + exclude: + - node: 12.22.0 + testing-library-dom: 9 + - node: 12 + testing-library-dom: 9 runs-on: ubuntu-latest steps: - - name: 🛑 Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 - - name: ⬇️ Checkout repo uses: actions/checkout@v3 @@ -40,6 +48,9 @@ jobs: - name: Install ESLint v${{ matrix.eslint }} run: npm install --no-save --force eslint@${{ matrix.eslint }} + - name: Install @testing-library/dom v${{ matrix.testing-library-dom }} + run: npm install --no-save --force @testing-library/dom@${{ matrix.testing-library-dom }} + - name: ▶️ Run validate script (without linting) if: ${{ matrix.eslint != 8 }} run: npm run validate -- build,test:coverage @@ -62,9 +73,6 @@ jobs: contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha', github.ref) && github.event_name == 'push' }} steps: - - name: 🛑 Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 - - name: ⬇️ Checkout repo uses: actions/checkout@v3 diff --git a/README.md b/README.md index f66f450..92c953a 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ MIT [npm]: https://www.npmjs.com [node]: https://nodejs.org -[build-badge]: https://img.shields.io/github/workflow/status/testing-library/eslint-plugin-jest-dom/validate?logo=github&style=flat-square +[build-badge]: https://img.shields.io/github/actions/workflow/status/testing-library/eslint-plugin-jest-dom/validate.yml?logo=github&style=flat-square [build]: https://github.com/testing-library/eslint-plugin-jest-dom/actions?query=workflow%3Avalidate [coverage-badge]: https://img.shields.io/codecov/c/github/testing-library/eslint-plugin-jest-dom.svg?style=flat-square [coverage]: https://codecov.io/github/testing-library/eslint-plugin-jest-dom @@ -196,6 +196,7 @@ MIT [coc]: https://github.com/testing-library/eslint-plugin-jest-dom/blob/main/other/CODE_OF_CONDUCT.md [emojis]: https://github.com/all-contributors/all-contributors#emoji-key [all-contributors]: https://github.com/all-contributors/all-contributors +[all-contributors-badge]: https://img.shields.io/github/all-contributors/testing-library/eslint-plugin-jest-dom?style=flat-square [bugs]: https://github.com/testing-library/eslint-plugin-jest-dom/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+sort%3Acreated-desc+label%3Abug [requests]: https://github.com/testing-library/eslint-plugin-jest-dom/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc+label%3Aenhancement [good-first-issue]: https://github.com/testing-library/eslint-plugin-jest-dom/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc+label%3Aenhancement+label%3A%22good+first+issue%22 diff --git a/package.json b/package.json index e76f628..673cc9a 100644 --- a/package.json +++ b/package.json @@ -42,20 +42,21 @@ }, "dependencies": { "@babel/runtime": "^7.16.3", - "@testing-library/dom": "^8.11.1", "requireindex": "^1.2.0" }, "devDependencies": { + "@testing-library/dom": "^8.20.0", "@typescript-eslint/parser": "^5.9.1", "eslint": "^8.7.0", "eslint-doc-generator": "^1.0.0", "eslint-remote-tester": "^3.0.0", - "eslint-remote-tester-repositories": "^0.0.7", + "eslint-remote-tester-repositories": "^1.0.1", "kcd-scripts": "^12.0.0", "typescript": "^4.5.3" }, "peerDependencies": { - "eslint": "^6.8.0 || ^7.0.0 || ^8.0.0" + "eslint": "^6.8.0 || ^7.0.0 || ^8.0.0", + "@testing-library/dom": "^8.0.0 || ^9.0.0" }, "eslintConfig": { "extends": "./node_modules/kcd-scripts/eslint.js",