From dab5502e8a16d34d29adee6f7f9cb4f4ae0dfd68 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Tue, 4 May 2021 10:55:43 +1000 Subject: Run pre-commit with GitHub Actions Running pre-commit with GitHub Actions now gives us more tests and coverage Remove duplicate GitHub Actions for merge conflicts and trailing whitespace Remove duplicate checks for markdownlint and yamllint from the GitHub Super-Linter Add new custom pre-commit hook running with a shell script to sort alphabetically and uniquify codespell.txt Add new pre-commit hook to check spelling with codespell https://github.com/codespell-project/codespell Fix spelling --- .github/workflows/lint.yml | 30 +++++++++++++++--------------- .github/workflows/linter.yml | 25 ------------------------- .github/workflows/super-linter.yml | 23 +++++++++++++++++++++++ 3 files changed, 38 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/linter.yml create mode 100644 .github/workflows/super-linter.yml (limited to '.github/workflows') diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3f8299c44..3e89c0328 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,29 +4,29 @@ on: [pull_request] jobs: misspell: - name: Check Spelling + name: Check spelling with misspell runs-on: ubuntu-latest steps: - name: Check Out uses: actions/checkout@v2.3.4 - name: Install - run: | - wget -O - -q https://git.io/misspell | sh -s -- -b . + run: wget -O - -q https://git.io/misspell | sh -s -- -b . - name: Misspell - run: | - git ls-files --empty-directory | xargs ./misspell -error - merge-conflict: - name: Merge Conflict + run: git ls-files --empty-directory | xargs ./misspell -error + pre-commit: + name: Run pre-commit runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 - name: Check merge conflict run: | - grep "^<<<<<<< HEAD" $(git ls-files | xargs) && exit 1 || true - trailing-whitespace: - name: Trailing whitespace - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.3.4 - - name: Check for trailing whitespace - run: "! git grep -EIn $'[ \t]+$'" + python -m pip install --upgrade pip + pip install pre-commit + - name: Set PY + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + - uses: actions/cache@v1 + with: + path: ~/.cache/pre-commit + key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} + - name: Run pre-commit + run: pre-commit run --all-files diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml deleted file mode 100644 index 4c1604960..000000000 --- a/.github/workflows/linter.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Lint Code Base - -on: - push: - branches-ignore: [master] - # Remove the line above to run when pushing to master - pull_request: - branches: [master] - -jobs: - build: - name: Lint Code Base - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.3.4 - - uses: github/super-linter@v4.2.2 - env: - ERROR_ON_MISSING_EXEC_BIT: true - VALIDATE_BASH: true - # VALIDATE_BASH_EXEC: true - # VALIDATE_EDITORCONFIG: true - VALIDATE_MARKDOWN: true - # VALIDATE_SHELL_SHFMT: true - VALIDATE_YAML: true - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml new file mode 100644 index 000000000..884f705d5 --- /dev/null +++ b/.github/workflows/super-linter.yml @@ -0,0 +1,23 @@ +name: Super Linter + +on: + push: + branches-ignore: [master] + # Remove the line above to run when pushing to master + pull_request: + branches: [master] + +jobs: + build: + name: Lint Code Base + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.4 + - uses: github/super-linter@v4.2.2 + env: + ERROR_ON_MISSING_EXEC_BIT: true + VALIDATE_BASH: true + # VALIDATE_BASH_EXEC: true + # VALIDATE_EDITORCONFIG: true + # VALIDATE_SHELL_SHFMT: true + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -- cgit v1.2.3