Skip to content

Commit

Permalink
Replace yamlfmt with pretty_yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick committed Jul 7, 2024
1 parent 198b2e1 commit 5e9a8a8
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 31 deletions.
12 changes: 12 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"dependencyDashboard": true,
"enabledManagers": ["regex"],
"extends": [
"github>kachick/renovate-config-dprint#1.1.0"
],
"labels": ["dependencies", "renovate"],
"nix": {
"enabled": false
}
}
11 changes: 0 additions & 11 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,3 @@ jobs:
.
.github
.vscode
yamlfmt:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v5
- name: Install yamlfmt
run: go install github.com/google/yamlfmt/cmd/[email protected] # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180
- run: yamlfmt -lint .
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ archives:
checksum:
name_template: 'checksums.txt'
snapshot:
name_template: "{{ incpatch .Version }}-next"
name_template: '{{ incpatch .Version }}-next'
changelog:
sort: asc
filters:
Expand Down
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"editorconfig.editorconfig",
"tekumara.typos-vscode",
"dprint.dprint",
"kachick.vscode-yamlfmt",
"jnoortheen.nix-ide",
"task.vscode-task"
]
Expand Down
6 changes: 0 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"editor.defaultFormatter": "dprint.dprint",
"editor.formatOnSave": true,
"[yaml]": {
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
},
"[github-actions-workflow]": {
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
},
"[nix]": {
"editor.defaultFormatter": "jnoortheen.nix-ide"
},
Expand Down
3 changes: 0 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,13 @@ tasks:
cmds:
- typos . .github .vscode --write-changes
- dprint fmt
- yamlfmt .
- go fmt ./...
- git ls-files '*.nix' | xargs nix fmt
lint:
# go fmt does not have option for no effect - https://github.com/golang/go/issues/41189
# nix fmt does not have option for no effect - https://github.com/NixOS/nix/issues/6918
cmds:
- dprint check
- yamlfmt -lint .
- go vet ./...
- goreleaser check
- typos . .github .vscode
Expand All @@ -57,6 +55,5 @@ tasks:
- task --version
- go version
- dprint --version
- yamlfmt -version
- goreleaser --version
- typos --version
4 changes: 3 additions & 1 deletion dprint.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"json": {},
"markdown": {},
"yaml": { "quotes": "preferSingle" },
"excludes": ["dist"],
"plugins": [
"https://plugins.dprint.dev/json-0.19.2.wasm",
"https://plugins.dprint.dev/markdown-0.16.4.wasm"
"https://plugins.dprint.dev/markdown-0.16.4.wasm",
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.2.0.wasm"
]
}
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

go_1_22
dprint
yamlfmt
goreleaser
typos
go-task
Expand Down
7 changes: 0 additions & 7 deletions yamlfmt.yml

This file was deleted.

0 comments on commit 5e9a8a8

Please sign in to comment.