Skip to content

Commit

Permalink
ci(lint): upgrade trunk (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
Serpentiel authored Apr 21, 2023
1 parent 159ea08 commit b2b8bb9
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 18 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
plugins
user_trunk.yaml
user.yaml
shims
10 changes: 10 additions & 0 deletions .trunk/configs/.yamllint.yaml
Original file line number Diff line number Diff line change
@@ -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
16 changes: 9 additions & 7 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -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:
- [email protected]
- [email protected]
# - [email protected] # This currently does not works for some reason.
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- git-diff-check
- [email protected].4
- [email protected].7
- [email protected]
ignore:
- linters: [markdownlint]
Expand All @@ -23,7 +24,8 @@ lint:
- CHANGELOG.md
runtimes:
enabled:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
actions:
enabled:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

<!-- ### Deprecated -->

Expand Down

0 comments on commit b2b8bb9

Please sign in to comment.