diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d92e2a39..5c670091 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -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 . diff --git a/.vscode/extensions.json b/.vscode/extensions.json index c4e8e6f9..280fae58 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -6,7 +6,6 @@ "soutaro.steep-vscode", "soutaro.rbs-syntax", "dprint.dprint", - "kachick.vscode-yamlfmt", "rubocop.vscode-rubocop", "jnoortheen.nix-ide" ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 97cd279f..30cd524d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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" }, diff --git a/Rakefile b/Rakefile index 311d24f4..fa1b52b5 100644 --- a/Rakefile +++ b/Rakefile @@ -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 diff --git a/dprint.json b/dprint.json index ddf4b9f2..59e34168 100644 --- a/dprint.json +++ b/dprint.json @@ -3,6 +3,10 @@ }, "markdown": { }, + "yaml": { + "quotes": "preferSingle", + "trimTrailingWhitespaces": false + }, "excludes": [ ".git", "**/*lock.json", @@ -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" ] } diff --git a/flake.nix b/flake.nix index 181f3b33..69cde513 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,6 @@ nil nixfmt-rfc-style typos - yamlfmt ]; }; diff --git a/steep_expectations.yml b/steep_expectations.yml index dcd024e9..fe925944 100644 --- a/steep_expectations.yml +++ b/steep_expectations.yml @@ -1 +1,2 @@ ---- [] +--- +[] diff --git a/yamlfmt.yml b/yamlfmt.yml deleted file mode 100644 index 0c7d3f90..00000000 --- a/yamlfmt.yml +++ /dev/null @@ -1,9 +0,0 @@ -gitignore_excludes: true -exclude: - - 'steep_expectations.yml' -line_ending: lf -formatter: - type: basic - retain_line_breaks_single: true - # https://github.com/google/yamlfmt/issues/182 - scan_folded_as_literal: true