MNT: Sync develop's Renovate config with master (#1039)#1040
Merged
Conversation
Renovate reads its config only from the default branch (master), where the corrected config is added in #1039. This updates develop's renovate.json to be byte-identical to that one (pip-compile manager for the autogenerated docs/requirements.txt; pip_requirements disabled for that file) so master and develop don't diverge and the next master<->develop merge won't hit an add/add conflict on .github/renovate.json. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #1040 +/- ##
===========================================
+ Coverage 80.27% 81.17% +0.90%
===========================================
Files 104 113 +9
Lines 12769 14689 +1920
===========================================
+ Hits 10250 11924 +1674
- Misses 2519 2765 +246 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
Renovate reads its configuration only from the default branch (
master). The corrected config is being added tomasterin #1039. This PR updatesdevelop'srenovate.jsonto be byte-identical to that one.Without this,
masteranddevelopwould hold different versions of.github/renovate.json(the file didn't exist at their merge base), and the nextmaster↔developmerge would hit an add/add conflict on that file. Making them identical lets the merge auto-resolve cleanly.What changed
develop'srenovate.jsonnow matches #1039:pip-compilemanager scoped to the autogenerateddocs/requirements.txt(regenerated fromdocs/requirements.in);pip_requirementsdisabled for that one file;baseBranches: ["develop"], grouping, label, dashboard).Note: only the master copy is the one Renovate actually reads. This copy exists purely to keep the two branches in lockstep.
Merge order
Merge #1039 (→ master) first — that's what activates Renovate. Then merge this one (→ develop) as housekeeping.