From f6fde4be1f9be61159bc6ce3d498005b9492571a Mon Sep 17 00:00:00 2001 From: haru Date: Sat, 18 May 2024 06:02:35 +0900 Subject: [PATCH] =?UTF-8?q?feat(chore)!:=20shellcheck=20=E3=81=AB=E3=82=88?= =?UTF-8?q?=E3=82=8B=20lint=20=E3=82=92=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/reviewdog.yml | 8 -------- .github/workflows/test.yml | 4 ---- .husky/commit-msg | 4 ---- .husky/pre-commit | 4 ---- .lintstagedrc.yml | 2 -- .vscode/extensions.json | 3 +-- Makefile | 7 ++----- README.md | 1 - docs/CONTRIBUTING.md | 15 +++++++-------- 9 files changed, 10 insertions(+), 38 deletions(-) diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 9d89389..18242ec 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -26,14 +26,6 @@ jobs: uses: reviewdog/action-yamllint@v1 with: reporter: github-pr-review - - name: ShellCheck - uses: reviewdog/action-shellcheck@v1 - with: - reporter: github-pr-review - pattern: | - *.sh - commit-msg - pre-commit - name: actionlint uses: reviewdog/action-actionlint@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc63a94..edf3a85 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,10 +34,6 @@ jobs: uses: karancode/yamllint-github-action@v2.1.1 with: yamllint_strict: true - - name: "Lint: shell script" - uses: ludeeus/action-shellcheck@2.0.0 - with: - ignore_paths: .husky/_ node_modules - name: "Lint: GitHub Actions workflow" # yamllint disable rule:line-length run: | diff --git a/.husky/commit-msg b/.husky/commit-msg index 85a9328..da99483 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,5 +1 @@ -#!/usr/bin/env sh -# shellcheck disable=SC1091 -. "$(dirname -- "$0")/_/husky.sh" - npx --no -- commitlint --edit "$1" diff --git a/.husky/pre-commit b/.husky/pre-commit index 61064ce..faed10b 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,7 +1,3 @@ -#!/usr/bin/env sh -# shellcheck disable=SC1091 -. "$(dirname -- "$0")/_/husky.sh" - npx lint-staged # .textlintignore で foo.md を無視するように指定していたとしても、`textlint foo.md` を実行すると diff --git a/.lintstagedrc.yml b/.lintstagedrc.yml index 213bec8..a987daa 100644 --- a/.lintstagedrc.yml +++ b/.lintstagedrc.yml @@ -4,6 +4,4 @@ - prettier --check "*.{md,markdown}": markdownlint "*.{yml,yaml}": yamllint --strict -"*.sh": shellcheck -".husky/*": shellcheck ".github/workflows/*.{yml,yaml}": actionlint diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 161f670..b29f108 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -8,7 +8,6 @@ "ms-vscode.makefile-tools", "RomanPeshkov.vscode-text-tables", "shuworks.vscode-table-formatter", - "taichi.vscode-textlint", - "timonwong.shellcheck" + "taichi.vscode-textlint" ] } diff --git a/Makefile b/Makefile index a80624f..ca9758b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -.PHONY: dev-install lint lint-npm lint-yml lint-sh lint-action update-gi +.PHONY: dev-install lint lint-npm lint-yml lint-action update-gi dev-install: git submodule update --init --recursive npm ci -lint: lint-npm lint-yml lint-sh lint-action +lint: lint-npm lint-yml lint-action lint-npm: npm run lint @@ -12,9 +12,6 @@ lint-npm: lint-yml: yamllint --strict . -lint-sh: - shellcheck .husky/commit-msg .husky/pre-commit - lint-action: actionlint diff --git a/README.md b/README.md index a0a08f1..e136243 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,6 @@ | Lint：Markdown | [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli) | | Lint：テキスト（散文） | [textlint](https://textlint.github.io/) | | Lint：YAML | [yamllint](https://yamllint.readthedocs.io/) | -| Lint：シェルスクリプト | [ShellCheck](https://github.com/koalaman/shellcheck) | | Lint：JSON、その他 | [Prettier](https://prettier.io/) | | Lint：GitHub Actions ワークフロー | [actionlint](https://github.com/rhysd/actionlint) | | Lint：GitHub PR タイトル | [semantic-pull-request](https://github.com/marketplace/actions/semantic-pull-request) | diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 26f0858..3a261ec 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,14 +2,13 @@ ## 動作要件 -| ツール | バージョン | -| ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | -| Node.js | [.tool-versions](https://github.com/haru52/base_template_ja/blob/main/.tool-versions) | -| npm | [package.json](https://github.com/haru52/base_template_ja/blob/main/package.json) における `engines.npm` の値 | -| [gibo](https://github.com/simonwhitaker/gibo) | ^3.0.11 | -| [yamllint](https://yamllint.readthedocs.io/) | ^1.35.1 | -| [ShellCheck](https://github.com/koalaman/shellcheck) | ^0.10.0 | -| [actionlint](https://github.com/rhysd/actionlint) | [.tool-versions](https://github.com/haru52/base_template_ja/blob/main/.tool-versions) | +| ツール | バージョン | +| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | +| Node.js | [.tool-versions](https://github.com/haru52/base_template_ja/blob/main/.tool-versions) | +| npm | [package.json](https://github.com/haru52/base_template_ja/blob/main/package.json) における `engines.npm` の値 | +| [gibo](https://github.com/simonwhitaker/gibo) | ^3.0.11 | +| [yamllint](https://yamllint.readthedocs.io/) | ^1.35.1 | +| [actionlint](https://github.com/rhysd/actionlint) | [.tool-versions](https://github.com/haru52/base_template_ja/blob/main/.tool-versions) | ## 規約