Skip to content

Commit

Permalink
Replace yamlfmt with pretty_yaml (#578)
Browse files Browse the repository at this point in the history
* Replace yamlfmt with pretty_yaml

kachick/anylang-template@23ddc89
kachick/vscode-extension-yamlfmt@a597e68

* Revert dropped empty steep_expectations.yml again
  • Loading branch information
kachick authored Jul 15, 2024
1 parent 8b0c593 commit 1f42e0d
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 36 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,3 @@ jobs:
.
.github
.vscode
yamlfmt:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Install mise
run: |
curl https://mise.jdx.dev/install.sh | sh
echo "$HOME/.local/share/mise/bin" >> $GITHUB_PATH
echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
- name: Install yamlfmt
# TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180
run: mise use -g yamlfmt@0.12.1
- run: yamlfmt -lint .
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"soutaro.steep-vscode",
"soutaro.rbs-syntax",
"dprint.dprint",
"kachick.vscode-yamlfmt",
"rubocop.vscode-rubocop",
"jnoortheen.nix-ide"
]
Expand Down
6 changes: 0 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
"[ruby]": {
"editor.defaultFormatter": "rubocop.vscode-rubocop"
},
"[yaml]": {
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
},
"[github-actions-workflow]": {
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
},
"[nix]": {
"editor.defaultFormatter": "jnoortheen.nix-ide"
},
Expand Down
2 changes: 0 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,12 @@ task :deps do
sh('dprint --version')
sh('tree --version')
sh('typos --version')
sh('yamlfmt -version')
end

desc 'Tests except ruby'
task :check_non_ruby do
Rake::Task['dprint'].invoke
sh('typos . .github .vscode')
sh('yamlfmt -lint .')
# nix fmt doesn't have check: https://github.com/NixOS/nix/issues/6918
sh("git ls-files '*.nix' | xargs nixfmt --check")
end
7 changes: 6 additions & 1 deletion dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
},
"markdown": {
},
"yaml": {
"quotes": "preferSingle",
"trimTrailingWhitespaces": false
},
"excludes": [
".git",
"**/*lock.json",
Expand All @@ -13,6 +17,7 @@
],
"plugins": [
"https://plugins.dprint.dev/json-0.19.1.wasm",
"https://plugins.dprint.dev/markdown-0.16.3.wasm"
"https://plugins.dprint.dev/markdown-0.16.3.wasm",
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.3.0.wasm"
]
}
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
nil
nixfmt-rfc-style
typos
yamlfmt
];
};

Expand Down
3 changes: 2 additions & 1 deletion steep_expectations.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--- []
---
[]
9 changes: 0 additions & 9 deletions yamlfmt.yml

This file was deleted.

0 comments on commit 1f42e0d

Please sign in to comment.