From 7d2a2e10b3c82b660d3b4e6a6bd6df9a6e491b99 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Wed, 23 Jun 2021 10:06:11 +1000 Subject: Add official pre-commit file-contents-sorter Remove unneeded bash script sort-codespell-wordlist.sh https://github.com/pre-commit/pre-commit-hooks#file-contents-sorter --- .pre-commit-config.yaml | 11 ++--------- scripts/ci/pre-commit/sort-codespell-wordlist.sh | 7 ------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100755 scripts/ci/pre-commit/sort-codespell-wordlist.sh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e7887aba9..933324ae5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,6 +21,8 @@ repos: - id: check-yaml - id: detect-private-key - id: end-of-file-fixer + - id: file-contents-sorter + files: ^codespell\.txt$ - id: fix-byte-order-marker - id: mixed-line-ending - id: trailing-whitespace @@ -54,12 +56,3 @@ repos: entry: yamllint --strict -c .github/linters/.yaml-lint.yml types: [yaml] files: \.(yaml|yml)$ - - repo: local - hooks: - - id: sort-codespell-wordlist - name: Sort codespell.txt - description: Sort alphabetically and uniquify codespell.txt - entry: ./scripts/ci/pre-commit/sort-codespell-wordlist.sh - language: system - files: ^\.pre-commit-config\.yaml$|^codespell\.txt$ - require_serial: true diff --git a/scripts/ci/pre-commit/sort-codespell-wordlist.sh b/scripts/ci/pre-commit/sort-codespell-wordlist.sh deleted file mode 100755 index e5250f0a9..000000000 --- a/scripts/ci/pre-commit/sort-codespell-wordlist.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -CODESPELL_WORDLIST="codespell.txt" -temp_file=$(mktemp) -sort <"${CODESPELL_WORDLIST}" | uniq >"${temp_file}" -cat "${temp_file}" >"${CODESPELL_WORDLIST}" -rm "${temp_file}" -- cgit v1.2.3