diff --git a/base.json b/base.json index e613504..401559c 100644 --- a/base.json +++ b/base.json @@ -21,14 +21,16 @@ "matchDatasources": ["github-releases"], "matchPackagePatterns": ["^thegeeklab/hugo-(geekdoc|geekblog)"], "matchUpdateTypes": ["minor", "patch"], - "automerge": true + "automerge": true, + "automergeType": "branch" }, { "description": "Automerge hugo ci updates", "matchManagers": ["woodpecker"], "matchPackageNames": ["quay.io/thegeeklab/hugo"], "matchUpdateTypes": ["patch"], - "automerge": true + "automerge": true, + "automergeType": "branch" }, { "description": "Automerge dev dependencies", @@ -36,6 +38,7 @@ "matchDepTypes": ["devDependencies", "dev-dependencies", "dev"], "matchUpdateTypes": ["pin", "digest", "patch", "minor"], "automerge": true, + "automergeType": "branch", "extends": ["schedule:weekly"] } ], diff --git a/docker.json b/docker.json index ac8bd79..2ddb719 100644 --- a/docker.json +++ b/docker.json @@ -19,10 +19,11 @@ "^thegeeklab/(alpine|nginx)" ], "matchUpdateTypes": ["pin", "digest"], - "automerge": true + "automerge": true, + "automergeType": "branch" }, { - "description": "Helper tools for docker base images", + "description": "Automerge helper tools for docker base images", "groupName": "docker helper tools", "matchDatasources": ["github-releases"], "matchManagers": ["dockerfile"], diff --git a/golang.json b/golang.json index c5c72f4..6404c29 100644 --- a/golang.json +++ b/golang.json @@ -16,6 +16,7 @@ "matchPackageNames": ["mvdan/gofumpt", "golangci/golangci-lint"], "matchUpdateTypes": ["pin", "digest", "patch", "minor"], "automerge": true, + "automergeType": "branch", "extends": ["schedule:weekly"] }, {