summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kriese <michael.kriese@visualon.de>2024-04-08 09:16:51 +0200
committerMichael Kriese <michael.kriese@visualon.de>2024-04-08 09:19:58 +0200
commitcca21410786457217675355b46d40396d1e684c2 (patch)
treead5727276aed47a69fb55b8cccf798ce9b3f36ef
parentMerge pull request '[PORT] gitea#30279: Update JS dependencies and add new es... (diff)
downloadforgejo-cca21410786457217675355b46d40396d1e684c2.tar.xz
forgejo-cca21410786457217675355b46d40396d1e684c2.zip
Run Renovate more often
-rw-r--r--.forgejo/workflows/renovate.yml11
-rw-r--r--renovate.json8
2 files changed, 8 insertions, 11 deletions
diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index a9687db81a..423f9fb8ca 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -1,10 +1,7 @@
#
-# The 2am run will rebase what needs rebasing & trigger the CI
-# The 4am run will merge one of them
-#
-# These times are chosen to minimize the likelyhood that another PR
-# is merged at the same time. This would not be necessary if automerge
-# worked but as of 30 March 2024 it does not.
+# Runs every 2 hours, but Renovate is limited to create new PR before 4am.
+# See renovate.json for more settings.
+# Automerge is enabled for Renovate PR's but need to be approved before.
#
name: renovate
@@ -13,7 +10,7 @@ on:
branches:
- 'renovate/**' # self-test updates
schedule:
- - cron: '0 2,4 * * *'
+ - cron: '0 0/2 * * *'
env:
RENOVATE_DRY_RUN: ${{ (github.event_name != 'schedule' && github.ref_name != github.event.repository.default_branch) && 'full' || '' }}
diff --git a/renovate.json b/renovate.json
index 747501a66a..6ad8a502a4 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,7 +4,9 @@
"config:best-practices",
":approveMajorUpdates",
"group:postcss",
- "group:linters"
+ "group:linters",
+ "schedule:daily",
+ "schedule:automergeDaily"
],
"ignorePresets": [
":semanticPrefixFixDepsChoreOthers",
@@ -13,7 +15,6 @@
],
"semanticCommits": "disabled",
"postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths", "npmDedupe"],
- "platformAutomerge": false,
"prConcurrentLimit": 5,
"packageRules": [
{
@@ -40,10 +41,9 @@
"automerge": true
},
{
- "description": "Update renovate only daily with higher prio to come through rate limit",
+ "description": "Update renovate with higher prio to come through rate limit",
"matchDatasources": ["docker"],
"matchDepNames": ["ghcr.io/visualon/renovate"],
- "extends": ["schedule:daily"],
"prPriority": 10
},
{