[stable10] Bump latest symfony and sabre/vobject point versions#30102
[stable10] Bump latest symfony and sabre/vobject point versions#30102phil-davis wants to merge 2 commits intostable10from
Conversation
|
Note: this also bumps minor versions of other stuff in |
Codecov Report
@@ Coverage Diff @@
## stable10 #30102 +/- ##
==============================================
- Coverage 58.95% 58.94% -0.01%
+ Complexity 18092 18091 -1
==============================================
Files 1065 1065
Lines 62234 62230 -4
==============================================
- Hits 36687 36681 -6
- Misses 25547 25549 +2
Continue to review full report at Codecov.
|
| { | ||
| "name": "behat/behat", | ||
| "version": "v3.3.0", | ||
| "version": "v3.4.3", |
There was a problem hiding this comment.
I prefer to only update libs which are related to this change.
There was a problem hiding this comment.
To resolve conflicts in trying to backport composer.lock it is really necessary to run composer update and let it regenerate composer.lock again. That file is not the sort of thing to hand-edit.
So this here is the result.
What to do?
There was a problem hiding this comment.
to update the lock file try running
composer update --lockThere was a problem hiding this comment.
If I make a new branch off stable10 and then do composer update --lock no change happens to composer.lock - if I composer update then composer.lock contains changes that bump minor versions of all sorts of stuff to be like what is already in master, because those versions are "waiting to happen" for stable10
For this PR, there is actually no change to composer.json - in master we just did composer update and it bumped what it needed in composer.json When we backport to stable10 we get more stuff bumped because stable10 has not has a composer update for a while.
There was a problem hiding this comment.
Try make update-composer instead, it should regenerate the lock file. Not sure if that's the same...
There was a problem hiding this comment.
I used make update-composer this time while doing a rebase to resolve conflicts. That produces a similar result - plenty of bumps of versions like this.
96dd569 to
01ed778
Compare
|
See #30266 for another try at this. |
|
@phil-davis |
|
@patrickjahns #30266 has a better attempt at this. |
|
Done in #30266 |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Backport #29977