From 10c0ea0cbf2f510ff1afaa369404c8a78daf2f8b Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Mon, 8 Jul 2024 19:59:53 +0200 Subject: [PATCH] chore: editorconfig check --- .ecrc | 2 +- .editorconfig | 5 +---- .github/workflows/main.yaml | 4 +++- salt/dotfiles | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.ecrc b/.ecrc index 243da02..e430086 100644 --- a/.ecrc +++ b/.ecrc @@ -3,7 +3,7 @@ "Debug": false, "IgnoreDefaults": false, "NoColor": false, - "Exclude": ["LICENSES", "\\.asc$"], + "Exclude": ["LICENSES", "\\.asc$", "\\.reuse/dep5"], "SpacesAfterTabs": false, "Disable": { "EndOfLine": false, diff --git a/.editorconfig b/.editorconfig index b4026e9..d1933de 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,12 +12,9 @@ insert_final_newline = true charset = utf-8 end_of_line = lf -[{.gitmodules,**/git/**/config}] +[{.gitmodules,**/git/**/config,**/git/**/config.d/*,**/git/**/sample/*}] indent_style = tab indent_size = 8 [*.{md,sh,yaml,yml,toml}] indent_size = 2 - -[.reuse/dep5] -indent_size = 1 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 17c5953..5e120b8 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -51,7 +51,9 @@ jobs: SPEC_PACKAGER: Ben Grande - uses: editorconfig-checker/action-editorconfig-checker@main - name: Run Editorconfig Checker - run: editorconfig-checker + run: | + editorconfig-checker + editorconfig-checker salt/dotfiles - name: Lint commits run: | if test "${{ github.event_name}}" = "pull_request" diff --git a/salt/dotfiles b/salt/dotfiles index f94876f..5936b20 160000 --- a/salt/dotfiles +++ b/salt/dotfiles @@ -1 +1 @@ -Subproject commit f94876f0f019560d16944c61751f310319495a79 +Subproject commit 5936b2059cbbf2f1e013092638b47f00e9abe0ee