Create pshopify2 for 4.0.2 to get fiber GC patch#78
Conversation
|
Can we backport the desired commit first? The backport branch for 4_0 has a good looking fix on it that these branches are now missing. |
|
@rwstauner thanks for the headsup! I am new to our backport process and just tried to replicate the approach - wasn't aware that we re-start from a ruby/ruby branch. Will take this as the base, reapply patch & revert 4.0.2 on 4.0.1 👍 |
|
There are times that we want custom shopify patches to be distributed to all shopify applications but that becomes difficult to maintain, and this isn't really one of those cases since the desired commit has already merged to ruby head. |
|
We should create the backport PR for ruby/ruby. We should probably also just upgrade SFR to ruby 4.0.2 so we don't have to keep doing the "revert 4.0.2" on top of that branch. |
0451d50 to
60b2991
Compare
|
@rwstauner branch updated to track latest |
This is not accurate. Currently both branches contain roughly the same code, however they are not linked in any way. Currently we are still on 4.0.1, but we should be able to upgrade to 4.0.2 (I've started that process). |
rwstauner
left a comment
There was a problem hiding this comment.
Looks good, thank you.
I'm glad we got that other patch from John included here.
Why?
This patch from @samuel-williams-shopify unblocks work for Storefront. We want it to be available on 4.0.2 before the next release cycle.
Approach
"v4.0.2-pshopify2"autoconfwhich caused--branch v4.0.1-pshopify2autoconfin GH Action4.0.2, because4.0.1is anyways tracking the exact same changes, so Storefront will update from4.0.1-pshopify1to4.0.2-pshopify24.0.2-pshopify1has landed onruby/ruby'sruby_4_0backport branch. The divergence between both branches caused the changeEnsure fiber stack is freed in all cases, if the fiber is terminated. (#16416)to be included in the changelog again, even though4.0.2-pshopify1already has that fix.