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 05c7d46 commit c560bb8
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 34 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@ jobs:
with:
dprint-version: '0.45.1' # selfup {"extract":"\\d[^']+","replacer":["bash","-c","dprint --version | cut -d ' ' -f 2"]}

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/yamlfmt@v0.12.1 # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180
- run: yamlfmt -lint .

typos:
timeout-minutes: 15
runs-on: ubuntu-24.04
Expand Down
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"editorconfig.editorconfig",
"tekumara.typos-vscode",
"dprint.dprint",
"kachick.vscode-yamlfmt",
"jnoortheen.nix-ide",
"ms-azuretools.vscode-docker"
]
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.enableLanguageServer": true,
"nix.serverPath": "nil",
"nix.serverSettings": {
Expand Down
3 changes: 0 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ tasks:
cmds:
- dprint fmt
- git ls-files '*.nix' | xargs nix fmt
- yamlfmt .
- shfmt --write ./images/*/*.bash
lint:
cmds:
- dprint check
- yamlfmt -lint .
- typos . .github .vscode
- git ls-files '*.nix' | xargs nixfmt --check
- trivy config --exit-code 1 .
Expand All @@ -41,6 +39,5 @@ tasks:
- nil --version
- task --version
- dprint --version
- yamlfmt -version
- typos --version
- trivy --version
7 changes: 2 additions & 5 deletions dprint.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{
"json": {},
"markdown": {},
"prettier": {
"printWidth": 120,
"singleQuote": true
},
"yaml": { "quotes": "preferSingle" },
"plugins": [
"https://plugins.dprint.dev/json-0.19.3.wasm",
"https://plugins.dprint.dev/markdown-0.17.1.wasm",
"https://plugins.dprint.dev/prettier-0.38.1.json@ae9b60b1ca7e22223cb47325b3d42c681444b46863d28ed92edc426f8a177e58"
"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 @@ -34,7 +34,6 @@
nixfmt-rfc-style
go-task
dprint
yamlfmt
typos
shfmt
shellcheck
Expand Down
7 changes: 0 additions & 7 deletions yamlfmt.yml

This file was deleted.

0 comments on commit c560bb8

Please sign in to comment.