diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 455c7429..18f9bdb7 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -9,11 +9,13 @@ "workarounds:all", // automerge minor updates ":automergeMinor", + ":automergeBranch" ], "labels": ["📦 dependencies"], "semanticCommits": "enabled", "semanticCommitType": "build", "rangeStrategy": "bump", + "rebaseWhen": "conflicted", "packageRules": [ // group updates to related packages { diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 98547a03..0f27774f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,8 +1,6 @@ name: Main workflow on: push: - branches: - - master paths-ignore: - "docs/**" - "**.md"