From 236c05995e33050d5054afa39f4b81feb8cfea96 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Fri, 26 Jul 2024 13:07:36 -0700 Subject: [PATCH] Dependabot groups --- .github/dependabot.yml | 25 ++++++++++++++++++----- .github/workflows/DependabotAutoMerge.yml | 1 - Utilities.code-workspace | 4 +++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index eeca9ad..52d88f0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,25 +4,40 @@ updates: # main - package-ecosystem: "nuget" - directory: "/" target-branch: "main" + directory: "/" schedule: interval: "daily" + groups: + nuget-deps: + patterns: + - "*" - package-ecosystem: "github-actions" - directory: "/" target-branch: "main" + directory: "/" schedule: interval: "daily" + groups: + actions-deps: + patterns: + - "*" # develop - package-ecosystem: "nuget" - directory: "/" target-branch: "develop" + directory: "/" schedule: interval: "daily" + groups: + nuget-deps: + patterns: + - "*" - package-ecosystem: "github-actions" - directory: "/" target-branch: "develop" + directory: "/" schedule: interval: "daily" - \ No newline at end of file + groups: + actions-deps: + patterns: + - "*" diff --git a/.github/workflows/DependabotAutoMerge.yml b/.github/workflows/DependabotAutoMerge.yml index 63fb5f3..0ee51da 100644 --- a/.github/workflows/DependabotAutoMerge.yml +++ b/.github/workflows/DependabotAutoMerge.yml @@ -28,7 +28,6 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Auto-merge dependabot non-major updates - # Only auto-merge non-major updates if: steps.metadata.outputs.update-type != 'version-update:semver-major' run: gh pr merge --auto --merge "$PR_URL" env: diff --git a/Utilities.code-workspace b/Utilities.code-workspace index fd6715b..2f39ee7 100644 --- a/Utilities.code-workspace +++ b/Utilities.code-workspace @@ -19,7 +19,9 @@ }, "[plaintext]": { "files.trimTrailingWhitespace": false - } + }, + "diffEditor.ignoreTrimWhitespace": false, + "editor.renderWhitespace": "trailing" }, "extensions": { "recommendations": [