Skip to content

Commit

Permalink
Replace dprint prettier plugin with yamlfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick committed May 20, 2024
1 parent b9a8922 commit 21c8cc0
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 6 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ jobs:
with:
dprint-version: '0.45.1' # selfup { "regex": "\\d[^']+", "script": "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/[email protected] # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180
- run: yamlfmt -lint .

typos:
timeout-minutes: 15
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"editorconfig.editorconfig",
"tekumara.typos-vscode",
"dprint.dprint",
"kachick.vscode-yamlfmt",
"jnoortheen.nix-ide"
]
}
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"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
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ desc 'Print dependencies'
task :deps do
sh('ruby --version')
sh('dprint --version')
sh('yamlfmt -version')
sh('typos --version')
end

desc 'Run linters'
task :lint do
sh('typos . .github .vscode')
sh('dprint check')
sh('yamlfmt -lint .')
sh('nixpkgs-fmt --check ./*.nix')
end
7 changes: 1 addition & 6 deletions dprint.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"json": {},
"markdown": {},
"prettier": {
"printWidth": 120,
"singleQuote": true
},
"excludes": ["**/*lock", "lib/**", "doc/**", ".yardoc"],
"plugins": [
"https://plugins.dprint.dev/json-0.19.2.wasm",
"https://plugins.dprint.dev/markdown-0.16.4.wasm",
"https://plugins.dprint.dev/prettier-0.39.0.json@896b70f29ef8213c1b0ba81a93cee9c2d4f39ac2194040313cd433906db7bc7c"
"https://plugins.dprint.dev/markdown-0.16.4.wasm"
]
}
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

ruby_3_2
dprint
yamlfmt
nil
nixpkgs-fmt
typos
Expand Down
7 changes: 7 additions & 0 deletions yamlfmt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
gitignore_excludes: true
line_ending: lf
formatter:
type: basic
retain_line_breaks_single: true
# https://github.com/google/yamlfmt/issues/182
scan_folded_as_literal: true

0 comments on commit 21c8cc0

Please sign in to comment.