Skip to content
This repository has been archived by the owner on Oct 21, 2024. It is now read-only.

Commit

Permalink
Replace yamlfmt with pretty_yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick committed Jul 15, 2024
1 parent f42e23b commit ecf6cbf
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 33 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,6 @@ jobs:
with:
dprint-version: '0.45.1' # selfup {"extract":"\\d[^']+","replacer":["dprint", "--version"], "nth": 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 yamlfmt@0.12.1
- 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 @@ -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 @@ -25,12 +25,10 @@ tasks:
fmt:
cmds:
- dprint fmt
- yamlfmt .
- git ls-files '*.nix' | xargs nix fmt
lint:
cmds:
- dprint check
- yamlfmt -lint .
- typos . .github .vscode
- git ls-files '*.nix' | xargs nixfmt --check
snapshot:
Expand All @@ -43,6 +41,5 @@ tasks:
- nil --version
- task --version
- dprint --version
- yamlfmt -version
- typos --version
- go version
4 changes: 4 additions & 0 deletions dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"trailingCommas": "never"
},
"markdown": {},
"yaml": {
"quotes": "preferSingle",
"trimTrailingWhitespaces": false
},
"plugins": [
"https://plugins.dprint.dev/json-0.19.2.wasm",
"https://plugins.dprint.dev/markdown-0.16.4.wasm",
Expand Down
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
nil
nixfmt-rfc-style
dprint
yamlfmt
typos
go-task
go_1_22
Expand Down
7 changes: 0 additions & 7 deletions yamlfmt.yml

This file was deleted.

0 comments on commit ecf6cbf

Please sign in to comment.