diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6fd68e5e9..538faba8f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,22 +18,17 @@ concurrency: jobs: cpp-lint: uses: ./.github/workflows/cpp-lint.yml - shell-lint: - uses: ./.github/workflows/shell-lint.yml ubuntu: needs: - cpp-lint - - shell-lint uses: ./.github/workflows/ubuntu.yml mac: needs: - cpp-lint - - shell-lint uses: ./.github/workflows/mac.yml windows: needs: - cpp-lint - - shell-lint uses: ./.github/workflows/windows.yml perf: needs: diff --git a/.github/workflows/shell-lint.yml b/.github/workflows/shell-lint.yml deleted file mode 100644 index b42179797..000000000 --- a/.github/workflows/shell-lint.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Shell Lint - -on: - workflow_call: - push: - paths: - - '**/*.sh' - - '.github/workflows/shell-lint.yml' - pull_request: - paths: - - '**/*.sh' - - '.github/workflows/shell-lint.yml' - -jobs: - shell-lint: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v4 - - name: Install shellcheck - run: | - sudo apt-get update - sudo apt-get install -y shellcheck - - name: Run shellcheck - run: shellcheck scripts/*.sh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 44dcaa00c..226b49081 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,6 +40,13 @@ repos: hooks: - id: yamllint + # Shell script linting with shellcheck + - repo: https://github.com/koalaman/shellcheck-precommit + rev: v0.10.0 + hooks: + - id: shellcheck + files: \.sh$ + # Configuration default_stages: [pre-commit] fail_fast: false