diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2d0860f..c9fc596 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -38,14 +38,3 @@ jobs: with: go-version-file: go.mod - uses: trunk-io/trunk-action@v1 - golangci-lint: - if: > - (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip workflows')) || - github.event_name == 'push' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v4 - with: - go-version-file: go.mod - - uses: golangci/golangci-lint-action@v3 diff --git a/.trunk/.gitignore b/.trunk/.gitignore index cf2f254..8130ba6 100644 --- a/.trunk/.gitignore +++ b/.trunk/.gitignore @@ -5,3 +5,4 @@ plugins user_trunk.yaml user.yaml +shims diff --git a/.trunk/configs/.yamllint.yaml b/.trunk/configs/.yamllint.yaml new file mode 100644 index 0000000..4d44466 --- /dev/null +++ b/.trunk/configs/.yamllint.yaml @@ -0,0 +1,10 @@ +rules: + quoted-strings: + required: only-when-needed + extra-allowed: ["{|}"] + empty-values: + forbid-in-block-mappings: true + forbid-in-flow-mappings: true + key-duplicates: {} + octal-values: + forbid-implicit-octal: true diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 6bd594d..f85f921 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,19 +1,20 @@ version: 0.1 cli: - version: 1.4.1 + version: 1.8.1 plugins: sources: - id: trunk - ref: v0.0.10 + ref: v0.0.16 uri: https://github.com/trunk-io/plugins lint: enabled: - - actionlint@1.6.23 - - gitleaks@8.15.3 - # - golangci-lint@1.51.1 # This currently does not works for some reason. + - yamllint@1.30.0 + - actionlint@1.6.24 + - gitleaks@8.16.3 + - golangci-lint@1.52.2 - gofmt@1.19.3 - git-diff-check - - prettier@2.8.4 + - prettier@2.8.7 - markdownlint@0.33.0 ignore: - linters: [markdownlint] @@ -23,7 +24,8 @@ lint: - CHANGELOG.md runtimes: enabled: - - go@1.18.3 + - python@3.10.8 + - go@1.19.5 - node@18.12.1 actions: enabled: diff --git a/CHANGELOG.md b/CHANGELOG.md index a71908d..57a8d15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - chore(golangci-lint): drop forced version - ci(lint): go-version switch to go.mod - chore(ci): make if statements multiline +- ci(lint): upgrade trunk