diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 6ed53aedd..84f38c4e9 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -4,7 +4,7 @@ cli: plugins: sources: - id: trunk - ref: v0.0.5 + ref: v0.0.6 uri: https://github.com/trunk-io/plugins runtimes: enabled: @@ -13,21 +13,21 @@ runtimes: - python@3.10.3 lint: enabled: - - actionlint@1.6.21 + - actionlint@1.6.22 - black@22.10.0 - - cspell@6.12.0 + - cspell@6.13.3 - flake8@5.0.4: packages: - - flake8-bugbear@22.9.23 + - flake8-bugbear@22.10.27 - git-diff-check@SYSTEM - gitleaks@8.15.0 - isort@5.10.1 - markdownlint@0.32.2 - prettier@2.7.1 - - semgrep@0.118.0 + - semgrep@0.120.0 - shellcheck@0.8.0 - shfmt@3.5.0 - - sqlfluff@1.3.2 + - sqlfluff@1.4.1 - yamllint@1.28.0 actions: definitions: @@ -55,6 +55,7 @@ actions: - files: - .trunk/cspell-words.txt enabled: + - trunk-announce - sort-dictionary - toggle-local - trunk-cache-prune diff --git a/actions/buf/readme.md b/actions/buf/readme.md new file mode 100644 index 000000000..292b1cf5d --- /dev/null +++ b/actions/buf/readme.md @@ -0,0 +1,3 @@ +# buf-gen + +Generates files from `.proto` files using [`buf`](https://buf.build) whenever protobuf files change. **Must** have a `buf.gen.yaml` and `buf.work.yaml` (if running from project root) diff --git a/actions/go-mod-tidy-vendor/readme.md b/actions/go-mod-tidy-vendor/readme.md new file mode 100644 index 000000000..b43ce361c --- /dev/null +++ b/actions/go-mod-tidy-vendor/readme.md @@ -0,0 +1,3 @@ +# go-mod-tidy-vendor + +Run `go mod tidy` followed by `go mod vendor` whenever go.mod file is modified diff --git a/actions/go-mod-tidy/readme.md b/actions/go-mod-tidy/readme.md new file mode 100644 index 000000000..1e94db18d --- /dev/null +++ b/actions/go-mod-tidy/readme.md @@ -0,0 +1,3 @@ +# go-mod-tidy + +Run `go mod tidy` whenever go.mod file is modified diff --git a/linters/pragma-once/readme.md b/linters/pragma-once/readme.md new file mode 100644 index 000000000..1caf3c927 --- /dev/null +++ b/linters/pragma-once/readme.md @@ -0,0 +1,3 @@ +# pragma-once + +Formatter that ensures every header file begins with `#pragma once` diff --git a/readme.md b/readme.md index fed03f2a0..4e8cace51 100644 --- a/readme.md +++ b/readme.md @@ -21,17 +21,18 @@ ### Welcome -This repository is the official, managed repository for integration actions and linters into trunk. It is imported by default in all trunk configurations (since v0.17.0-beta). +This repository is the official, managed repository for integration actions and linters into trunk. It is imported by default in all trunk configurations. By consolidating and sharing integrations for linters/actions into a single repository we hope to make the discovery, management and integration of new tools as straight-forward as possible. ### Enabling a supported linter -| language | linters | -| -------- | --------------------- | -| All | `cspell`, `codespell` | -| C++ | pragma-once | -| SQL | `sqlfluff` | +| language | linters | +| -------- | ------------------------------------------------------------------------------------------------------------------- | +| All | [cspell](https://github.com/streetsidesoftware/cspell), [codespell](https://github.com/codespell-project/codespell) | +| C++ | [pragma-once](linters/pragma-once/readme.md) | +| SQL | [sqlfluff](https://github.com/sqlfluff/sqlfluff), [sqlfmt](https://github.com/tconbeer/sqlfmt) | +| Security | [nancy](https://github.com/sonatype-nexus-community/nancy), [trivy](https://github.com/aquasecurity/trivy) | ```bash trunk check enable {linter} @@ -39,10 +40,12 @@ trunk check enable {linter} ### Enabling a supported action -| action | description | -| ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| commitlint | [`commitlint`](https://github.com/conventional-changelog/commitlint) checks if your commit messages meet the conventional commit format. | -| buf-gen | generates files from `.proto` files using [`buf`](https://buf.build) whenever protobuf files change. **Must** have a `buf.gen.yaml` and `buf.work.yaml` (if running from project root) | +| action | description | +| -------------------------------------------------------------------- | ---------------------------------------------------------- | +| [`buf-gen`](actions/buf/readme.md) | run `buf` on .proto file change | +| [`commitlint`](https://github.com/conventional-changelog/commitlint) | enforce conventional commit message for your local commits | +| [`go-mod-tidy`](actions/go-mod-tidy/readme.md) | automatically tidy go.mod file | +| [`go-mod-tidy-vendor`](actions/go-mod-tidy-vendor/readme.md) | automatically tidy and vendor go.mod file | ```bash trunk actions enable {action}