diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aaeca7d..4614c98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,15 +34,9 @@ jobs: - uses: jdx/mise-action@v3 - - name: Lint Go + - name: Lint run: mise run lint - - name: Lint Shell - uses: ludeeus/action-shellcheck@master - with: - scandir: ./bin - severity: warning - test: runs-on: ubuntu-latest steps: diff --git a/.mise.toml b/.mise.toml index 3bda531..0b0fa03 100644 --- a/.mise.toml +++ b/.mise.toml @@ -13,12 +13,17 @@ description = "Run Go integration tests" depends = ["build"] run = "go test ./cmd/jjtask/cmd/..." +[tasks."lint:shell"] +description = "Run shellcheck on shell scripts" +run = "shellcheck bin/jj claude-plugin/bin/jj-guard" + +[tasks."lint:go"] +description = "Run golangci-lint" +run = "golangci-lint run" + [tasks.lint] description = "Run all linters" -run = """ -golangci-lint run -shellcheck bin/jj claude-plugin/bin/jj-guard -""" +depends = ["lint:shell", "lint:go"] [tasks.fmt] description = "Format Go code" @@ -48,6 +53,7 @@ run = "./dev.sh" [tasks.release] description = "Create and push a release tag (patch/minor/major or vX.Y.Z)" +depends = ["ci"] run = """ #!/usr/bin/env bash set -euo pipefail