Skip to content

Commit

Permalink
Replace yamlfmt with pretty_yaml (#234)
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick authored Jul 15, 2024
1 parent f360cf5 commit a85b8f3
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 34 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,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: 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 [email protected]
- run: yamlfmt -lint .

typos:
timeout-minutes: 15
runs-on: ubuntu-24.04
Expand Down
3 changes: 1 addition & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"github.vscode-github-actions",
"rubocop.vscode-rubocop",
"tekumara.typos-vscode",
"dprint.dprint",
"kachick.vscode-yamlfmt"
"dprint.dprint"
]
}
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 @@ -39,7 +39,6 @@ desc 'Print dependencies'
task :deps do
sh('ruby --version')
sh('dprint --version')
sh('yamlfmt -version')
sh('tree --version')
sh('typos --version')
sh('nix --version')
Expand All @@ -49,7 +48,6 @@ end
desc 'Linters except ruby'
task :linters do
sh('dprint check')
sh('yamlfmt -lint .')
sh('typos . .github .vscode')
sh(%q!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 @@ -11,6 +15,7 @@
],
"plugins": [
"https://plugins.dprint.dev/json-0.19.2.wasm",
"https://plugins.dprint.dev/markdown-0.17.0.wasm"
"https://plugins.dprint.dev/markdown-0.17.0.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
dprint
yamlfmt
typos
];
};
Expand Down
7 changes: 0 additions & 7 deletions yamlfmt.yml

This file was deleted.

0 comments on commit a85b8f3

Please sign in to comment.