From 2ff10f672ebe3425726a95cb0eb12ad810c22b0a Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 6 Nov 2024 19:26:36 +0100 Subject: [PATCH 1/5] fix renovate config for forgejo (#170) Reviewed-on: https://git.mgrote.net/mg/homeserver/pulls/170 Co-authored-by: Michael Grote Co-committed-by: Michael Grote --- group_vars/git.yml | 2 +- renovate.json | 103 ++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 59 deletions(-) diff --git a/group_vars/git.yml b/group_vars/git.yml index b8a5c243..0a7e6bd0 100644 --- a/group_vars/git.yml +++ b/group_vars/git.yml @@ -55,7 +55,7 @@ ufw_rules: ### roles-ansible.gitea gitea_fork: "forgejo" # gitea update -gitea_version: "9.0.1" +gitea_version: "9.0.0" gitea_version_check: true gitea_backup_on_upgrade: false # gitea in the linux world diff --git a/renovate.json b/renovate.json index b68ecc39..daa73aa2 100644 --- a/renovate.json +++ b/renovate.json @@ -1,61 +1,48 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], - "ignorePaths": [ - "**/friedhof/**" - ], - "customManagers": [ - { - "customType": "regex", - "fileMatch": [ - "blocky.yml$" - ], - "matchStrings": [ - "blocky_version: (?v[\\d.]+)" - ], - "datasourceTemplate": "github-releases", - "depNameTemplate": "0xERR0R/blocky" - }, - { - "customType": "regex", - "fileMatch": [ - "pve.yml$" - ], - "matchStrings": [ - "cv4pve_version: (?v[\\d.]+)" - ], - "datasourceTemplate": "github-releases", - "depNameTemplate": "Corsinvest/cv4pve-autosnap" - } - ], - "packageRules": [ - { - "matchDatasources": [ - "github-releases" - ], - "matchDepNames": [ - "0xERR0R/blocky" - ], - "matchUpdateTypes": [ - "minor", - "patch" - ], - "automerge": true - }, - { - "matchDatasources": [ - "github-releases" - ], - "matchDepNames": [ - "Corsinvest/cv4pve-autosnap" - ], - "matchUpdateTypes": [ - "minor", - "patch" - ], - "automerge": true - } - ] + "extends": ["config:recommended"], + "ignorePaths": ["**/friedhof/**"], + "regexManagers": [{ + "fileMatch": ["blocky.yml$"], + "matchStrings": [ + "blocky_version: (?v[\\d.]+)" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "0xERR0R/blocky" + }, + { + "fileMatch": ["pve.yml$"], + "matchStrings": [ + "cv4pve_version: (?v[\\d.]+)" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "Corsinvest/cv4pve-autosnap" + }, + { + "fileMatch": ["git.yml$"], + "matchStrings": [ + "gitea_version: (?[\\d.]+)" + ], + "datasourceTemplate": "gitea-releases", + "packageName": "forgejo/forgejo", + "registryUrl": "https://codeberg.org/" + }], + "packageRules": [{ + "matchDatasources": ["github-releases"], + "matchDepNames": ["0xERR0R/blocky"], + "matchUpdateTypes": ["minor", "patch"], + "automerge": true + }, + { + "matchDatasources": ["github-releases"], + "matchDepNames": ["Corsinvest/cv4pve-autosnap"], + "matchUpdateTypes": ["minor", "patch"], + "automerge": true + }, + { + "matchDatasources": ["gitea-releases"], + "matchDepNames": ["forgejo"], + "matchUpdateTypes": ["minor", "patch"], + "automerge": true + }] } -- 2.43.0 From 38c82a72233cd683ee5f73fc1ea767b0cc56f7c5 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 6 Nov 2024 19:30:54 +0100 Subject: [PATCH 2/5] test --- renovate.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index daa73aa2..4409f3a3 100644 --- a/renovate.json +++ b/renovate.json @@ -24,8 +24,7 @@ "gitea_version: (?[\\d.]+)" ], "datasourceTemplate": "gitea-releases", - "packageName": "forgejo/forgejo", - "registryUrl": "https://codeberg.org/" + "depNameTemplate": "forgejo/forgejo" }], "packageRules": [{ "matchDatasources": ["github-releases"], @@ -43,6 +42,8 @@ "matchDatasources": ["gitea-releases"], "matchDepNames": ["forgejo"], "matchUpdateTypes": ["minor", "patch"], - "automerge": true + "automerge": true, + "packageName": "forgejo/forgejo", + "registryUrl": "https://codeberg.org/" }] } -- 2.43.0 From 8d00d2a33c19c1e82c5dbd65595e5e367847de5b Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 6 Nov 2024 19:33:02 +0100 Subject: [PATCH 3/5] test --- renovate.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/renovate.json b/renovate.json index 4409f3a3..0288fc06 100644 --- a/renovate.json +++ b/renovate.json @@ -24,7 +24,7 @@ "gitea_version: (?[\\d.]+)" ], "datasourceTemplate": "gitea-releases", - "depNameTemplate": "forgejo/forgejo" + "depNameTemplate": "https://codeberg.org/forgejo/forgejo" }], "packageRules": [{ "matchDatasources": ["github-releases"], @@ -42,8 +42,6 @@ "matchDatasources": ["gitea-releases"], "matchDepNames": ["forgejo"], "matchUpdateTypes": ["minor", "patch"], - "automerge": true, - "packageName": "forgejo/forgejo", - "registryUrl": "https://codeberg.org/" + "automerge": true }] } -- 2.43.0 From 2bafbf5fb1f339a27a049eb2852d980adb00b95f Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 6 Nov 2024 19:44:56 +0100 Subject: [PATCH 4/5] test --- renovate.json | 96 +++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/renovate.json b/renovate.json index 0288fc06..c095d5a8 100644 --- a/renovate.json +++ b/renovate.json @@ -1,47 +1,53 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:recommended"], - "ignorePaths": ["**/friedhof/**"], - "regexManagers": [{ - "fileMatch": ["blocky.yml$"], - "matchStrings": [ - "blocky_version: (?v[\\d.]+)" - ], - "datasourceTemplate": "github-releases", - "depNameTemplate": "0xERR0R/blocky" - }, - { - "fileMatch": ["pve.yml$"], - "matchStrings": [ - "cv4pve_version: (?v[\\d.]+)" - ], - "datasourceTemplate": "github-releases", - "depNameTemplate": "Corsinvest/cv4pve-autosnap" - }, - { - "fileMatch": ["git.yml$"], - "matchStrings": [ - "gitea_version: (?[\\d.]+)" - ], - "datasourceTemplate": "gitea-releases", - "depNameTemplate": "https://codeberg.org/forgejo/forgejo" - }], - "packageRules": [{ - "matchDatasources": ["github-releases"], - "matchDepNames": ["0xERR0R/blocky"], - "matchUpdateTypes": ["minor", "patch"], - "automerge": true - }, - { - "matchDatasources": ["github-releases"], - "matchDepNames": ["Corsinvest/cv4pve-autosnap"], - "matchUpdateTypes": ["minor", "patch"], - "automerge": true - }, - { - "matchDatasources": ["gitea-releases"], - "matchDepNames": ["forgejo"], - "matchUpdateTypes": ["minor", "patch"], - "automerge": true - }] + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["config:recommended"], + "ignorePaths": ["**/friedhof/**"], + "regexManagers": [ + { + "fileMatch": ["blocky.yml$"], + "matchStrings": [ + "blocky_version: (?v[\\d.]+)" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "0xERR0R/blocky" + }, + { + "fileMatch": ["pve.yml$"], + "matchStrings": [ + "cv4pve_version: (?v[\\d.]+)" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "Corsinvest/cv4pve-autosnap" + }, + { + "fileMatch": ["git.yml$"], + "matchStrings": [ + "gitea_version: (?[\\d.]+)" + ], + "datasourceTemplate": "gitea-releases", + "depNameTemplate": "forgejo/forgejo", + "registryUrls": ["https://codeberg.org"] + } + ], + "packageRules": [ + { + "matchDatasources": ["github-releases"], + "matchDepNames": ["0xERR0R/blocky"], + "matchUpdateTypes": ["minor", "patch"], + "automerge": true + }, + { + "matchDatasources": ["github-releases"], + "matchDepNames": ["Corsinvest/cv4pve-autosnap"], + "matchUpdateTypes": ["minor", "patch"], + "automerge": true + }, + { + "matchDatasources": ["gitea-releases"], + "matchDepNames": ["forgejo/forgejo"], + "matchUpdateTypes": ["minor", "patch"], + "automerge": true, + "registryUrls": ["https://codeberg.org"] + } + ] } -- 2.43.0 From 5b39e67e5de4d174acd1e1277fdc244db4608b7f Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 6 Nov 2024 19:51:32 +0100 Subject: [PATCH 5/5] test --- renovate.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/renovate.json b/renovate.json index c095d5a8..e62c9d6e 100644 --- a/renovate.json +++ b/renovate.json @@ -24,7 +24,7 @@ "matchStrings": [ "gitea_version: (?[\\d.]+)" ], - "datasourceTemplate": "gitea-releases", + "datasourceTemplate": "gitea-tags", "depNameTemplate": "forgejo/forgejo", "registryUrls": ["https://codeberg.org"] } @@ -43,11 +43,9 @@ "automerge": true }, { - "matchDatasources": ["gitea-releases"], + "matchDatasources": ["gitea-tags"], "matchDepNames": ["forgejo/forgejo"], - "matchUpdateTypes": ["minor", "patch"], - "automerge": true, - "registryUrls": ["https://codeberg.org"] + "automerge": true } ] } -- 2.43.0