diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml deleted file mode 100644 index 5ae36d07f0d..00000000000 --- a/.github/workflows/actionlint.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Lint GitHub Actions workflows - -on: - pull_request: - push: - branches: - - main - -# Cancels all previous workflow runs for pull requests that have not completed. -concurrency: - # The concurrency group contains the workflow name and the branch name for pull requests - # or the commit hash for any other events. - group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} - cancel-in-progress: true - -jobs: - actionlint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Check workflow files - run: | - echo "::add-matcher::.github/actionlint-matcher.json" - bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/v1.6.15/scripts/download-actionlint.bash) - ./actionlint -color - shell: bash diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 575f62212cb..f66b355ac21 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -129,6 +129,11 @@ repos: hooks: - id: shellcheck + - repo: https://github.com/rhysd/actionlint + rev: main + hooks: + - id: actionlint-docker + - repo: local # More local hooks are defined at the top. hooks: - id: types diff --git a/templates/.pre-commit-config.yaml.jinja b/templates/.pre-commit-config.yaml.jinja index ac24915e554..2b3f6170894 100644 --- a/templates/.pre-commit-config.yaml.jinja +++ b/templates/.pre-commit-config.yaml.jinja @@ -120,5 +120,10 @@ repos: rev: v0.8.0 hooks: - id: shellcheck + + - repo: https://github.com/rhysd/actionlint + rev: main + hooks: + - id: actionlint-docker {% block repos_bottom %} {% endblock %}