Merge main into the MediathekArr branch
Validate Helm Charts / Detect changed charts (pull_request) Successful in 3s
Validate Helm Charts / Resource quantities (pull_request) Successful in 7s
Validate Helm Charts / Build ${{ fromJSON(needs.detect-changed-charts.outputs.charts) }} (pull_request) Successful in 4s
Validate Helm Charts / Trivy config ${{ fromJSON(needs.detect-changed-charts.outputs.scan-charts) }} (pull_request) Successful in 11s
Validate Helm Charts / Install-test ${{ fromJSON(needs.detect-changed-charts.outputs.install-charts) }} (pull_request) Successful in 3m45s

The branch predates the Gitea move (#253) by 37 commits and both sides
touched the same two files. Merged rather than rebased, so the signed
commit of the original work stays intact, and resolved by combining
rather than choosing - both statements are true at once: the chart has
ten images now, and the repo lives on Gitea.

README.md, the one real conflict: this branch rewrote the freesailarr
image bullet from nine upstreams to ten, while main had grown a
minecraft-server bullet next to it that this branch never had. Kept
both - our "ten" wording and main's new bullet.

renovate.json5 merged cleanly, but "cleanly" is not "correctly", so the
result was read rather than trusted: the freesailarr exception now says
ten and gained the pointer to the mediathekarr digest block, while the
two things main added right beside it survived unchanged - the note that
the post-upgrade hook is allow-listed on the shared Gitea instance, and
the forge-neutral wording of the automerge rule. Nothing from before the
move brought "GitHub" back into a sentence that had been made neutral.
This commit is contained in:
jklein committed 2026-09-17 11:40:21 +02:00
commit ae621746a1
12 files changed
+442 -48

No files matched your search

+15 -4
View File
@@ -50,6 +50,14 @@
//
// Without that entry Renovate skips the task silently and every chart PR
// stays red on the version-bump check.
//
// On the Gitea side (#225) that entry EXISTS and was verified rather than
// hoped for: the shared instance's first run on the migrated repo produced
// a searxng PR whose diff carries `version: 1.0.4+up... -> 1.0.5+up...`
// next to the appVersion. No built-in manager touches `version:`, so that
// line can only come from this hook. Nothing has to be configured for the
// move - but the allow-list lives on that instance, not in this repo, so it
// is also not visible from here if it is ever removed.
postUpgradeTasks: {
commands: ["ci/renovate-bump-chart.sh {{{packageFileDir}}}"],
fileFilters: ["**/Chart.yaml"],
@@ -80,10 +88,13 @@
matchUpdateTypes: ["patch", "minor", "digest"],
automerge: true,
automergeType: "pr",
// Renovate waits for the checks itself instead of handing the PR to
// GitHub's auto-merge. GitHub would merge immediately when the branch has
// no required status checks configured — and validate-charts is not (yet)
// a required check.
// Renovate waits for the checks itself instead of handing the PR to the
// forge's own auto-merge. Both of them — GitHub's, and the auto-merge
// that takes the merge queue's place on Gitea, which has none — merge
// immediately when the branch has no required status checks configured,
// and validate-charts is not (yet) a required check on either side. This
// is a statement about the branch protection, not about the platform:
// once required checks exist on `main`, true is the better value.
platformAutomerge: false,
// A release that is hours old should not walk into main unattended; a
// chart publish follows the merge straight away.