From 04add9b91ef4cd559f5e174f7e930c711fd12658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Tue, 31 Jan 2023 15:56:02 +0100 Subject: [PATCH] revert config changes accidentally pushed --- .trunk/trunk.yaml | 15 ++------------- .vscode/extensions.json | 7 +++---- .vscode/settings.json | 6 +----- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index d168fec51..70acfd11b 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,6 +1,6 @@ version: 0.1 cli: - version: 1.3.2 + version: 1.3.1 plugins: sources: - id: trunk @@ -8,18 +8,8 @@ plugins: uri: https://github.com/trunk-io/plugins lint: enabled: - - svgo@3.0.2 - - shfmt@3.5.0 - - isort@5.11.4 - - black@22.12.0 - - hadolint@2.12.0 - - actionlint@1.6.23 - - flake8@6.0.0 - - markdownlint@0.33.0 - - shellcheck@0.9.0 - - oxipng@8.0.0 - git-diff-check - - gitleaks@8.15.3 + - gitleaks@8.15.2 - clang-format@14.0.0 - prettier@2.8.3 disabled: @@ -32,7 +22,6 @@ lint: - svgo@3.0.2 runtimes: enabled: - - python@3.10.8 - go@1.18.3 - node@18.12.1 actions: diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 080e70d08..4fc84fa78 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,9 +2,8 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ - "platformio.platformio-ide" + "ms-vscode.cpptools", + "platformio.platformio-ide", + "trunk.io" ], - "unwantedRecommendations": [ - "ms-vscode.cpptools-extension-pack" - ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 0e9ee3ced..3b489975b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,4 @@ { "editor.formatOnSave": true, - "editor.defaultFormatter": "trunk.io", - "githubPullRequests.ignoredPullRequestBranches": ["master"], - "files.associations": { - "*.tcc": "cpp" - } + "editor.defaultFormatter": "trunk.io" }