Skip to content
This repository has been archived by the owner on Jun 17, 2022. It is now read-only.

Upcoming v0.63.3 cherrypicks discussion #203

Closed
grabbou opened this issue Jul 22, 2020 · 56 comments
Closed

Upcoming v0.63.3 cherrypicks discussion #203

grabbou opened this issue Jul 22, 2020 · 56 comments
Labels
backport request Cherry picking a change into an existing release stable Stable version

Comments

@grabbou
Copy link
Member

grabbou commented Jul 22, 2020

Conversations on this thread are limited to 0.63 releases major issues and backport (cherry-pick) requests from commits that are already on master.

An example of a good such request is a bug fix for a serious issue that has been merged into master but did not make the 0.63.2 cut.

In other words, if you cannot point to a particular commit on master, then your request likely belongs as a new issue in http://github.com/facebook/react-native/issues.

@grabbou grabbou added stable Stable version backport request Cherry picking a change into an existing release labels Jul 22, 2020
@grabbou grabbou changed the title V0.63.2 Discussion V0.63.3 Discussion Jul 22, 2020
@grabbou grabbou changed the title V0.63.3 Discussion V0.63.2 Discussion Jul 22, 2020
@grabbou
Copy link
Member Author

grabbou commented Jul 22, 2020

(I am always scared I will skip one minor version)

@nhuson269

This comment has been minimized.

@1awaleed

This comment has been minimized.

@kelset
Copy link
Member

kelset commented Jul 22, 2020

@nhuson269 @1awaleed this issue is only for commits to cherry pick

@daveols

This comment has been minimized.

@sunnylqm

This comment has been minimized.

@kelset kelset changed the title V0.63.2 Discussion Upcoming v0.63.3 Discussion Jul 23, 2020
@kelset kelset changed the title Upcoming v0.63.3 Discussion Upcoming v0.63.3 cherrypicks discussion Jul 23, 2020
@makarkotlov
Copy link

makarkotlov commented Jul 27, 2020

@grabbou it seems like we need to fix this asap
commit: 2ecd79e431d16c696b486b828b322035e7ce6862
pr: facebook/react-native#29477

@SaeedZhiany

This comment has been minimized.

@alloy
Copy link
Member

alloy commented Jul 27, 2020

@TheSavior Can we get this merged so we can pick it here? facebook/react-native#29074.

Landed commit facebook/react-native@dc2df75

@makarkotlov

This comment has been minimized.

@sammy-SC
Copy link

sammy-SC commented Jul 29, 2020

@grabbou could I please get facebook/react-native@ffc90c7 picked ?

it resolves facebook/react-native#29364

is there any other information I need to provide?

Thank you

@cristianoccazinsp

This comment has been minimized.

@trcoffman
Copy link

Please get both of these released in tandem!

facebook/react-native@e566c7e
facebook/hermes@d188b72

@caiangums
Copy link

@grabbou could I please get facebook/react-native@ffc90c7 picked ?

it resolves facebook/react-native#29364

is there any other information I need to provide?

Thank you

I think if this really solves the issue for iOS, it would be nice to have! 👍 for this one!

@alphasp
Copy link

alphasp commented Aug 7, 2020

Image api getSizeWithHeaders on iOS is currently broken.
This commit fixed it: facebook/react-native@0bcc686

@kelset
Copy link
Member

kelset commented Aug 11, 2020

friendly reminder folks: it's August. Expect things to slow down.

There are currently only 3 commits requested that are cherry pickable:

The rest of the links are not actionables currently (one is an open PR and the other requires an Hermes releases AFAIK so not doable for a patch release).

@oleksandr-dziuban

This comment has been minimized.

@oleksandr-dziuban

This comment has been minimized.

@oleksandr-dziuban

This comment has been minimized.

@mikehardy

This comment has been minimized.

@lorenzoangelini

This comment has been minimized.

@kelset

This comment has been minimized.

@lorenzoangelini

This comment has been minimized.

@kelset

This comment has been minimized.

@kelset
Copy link
Member

kelset commented Sep 18, 2020

hey folks, currently no updates. We are still waiting on facebook/react-native#29477 to be merged since that should also be related to helping us move closer to be able to cut 0.64. What is likely to happen is 0.64rc0 first, then probably 0.63.3 (unless upgrading to 0.64 looks trivial in which case we'll focus on getting to 0.64.0 directly). Sorry for the delays, summer/end of summer are always complicated.

@yungsters
Copy link

Can we merge facebook/react-native@86ffb9c for facebook/react-native#29376?

@safaiyeh
Copy link
Member

Can we cherrypick facebook/react-native@d8b70b1
issue: facebook/react-native#28551

and make sure #203 (comment) as well makes it in. issue: facebook/react-native#29364

Both resolves image issues on Android & iOS that has had 100+ comments on each of their issues.

@SandroMachado
Copy link

SandroMachado commented Sep 21, 2020

Can we cherry-pick facebook/react-native@45954ac?

@alloy
Copy link
Member

alloy commented Sep 21, 2020

While not yet merged, I expect it to be merged soon. facebook/react-native#29995

@cristeahub

This comment has been minimized.

@sunnylqm

This comment has been minimized.

@cristeahub

This comment has been minimized.

@pokey
Copy link

pokey commented Sep 22, 2020

hey folks, currently no updates. We are still waiting on facebook/react-native#29477 to be merged since that should also be related to helping us move closer to be able to cut 0.64. What is likely to happen is 0.64rc0 first, then probably 0.63.3 (unless upgrading to 0.64 looks trivial in which case we'll focus on getting to 0.64.0 directly). Sorry for the delays, summer/end of summer are always complicated.

Hi @kelset; looks like facebook/react-native#29477 is merged. Any updates on release? Would be great to have that bundler working in staging and release again 😅

@alloy
Copy link
Member

alloy commented Sep 23, 2020

@kelset is currently on vacation, so I’ll try to find some time later this week or Monday to cut a release.

@a-eid

This comment has been minimized.

@alloy
Copy link
Member

alloy commented Sep 23, 2020

@a-eid As per the OP, this issue is only to discuss cherry-picking fixes that have landed in the master branch.

@kelset
Copy link
Member

kelset commented Sep 23, 2020

Let's try to sum up the current status of things:

Commits requested related to fixes:

This commit facebook/react-native@d8b70b1 has been requested but since it changes the version of Flipper, I have reservations of making this happen in a patch release, but happy to consider it if it's that important.

Aside from the above, there are 2 more things to keep an eye on:

@a-eid
Copy link

a-eid commented Sep 23, 2020

@kelset would be nice to have this as well:
facebook/react-native#29787

@pokey
Copy link

pokey commented Sep 23, 2020

@kelset thanks for the update! didn't realize facebook/react-native#29477 was merged so shortly before my comment 😅. I stumbled across that PR while in the midst of a furious debugging session , then saw this thread, and figured I'd bump, without seeing the timeline.

Thanks again for your responsiveness!

@jinshin1013
Copy link

Is it too late to add a commit for this version?

Fixes the iOS Gif not animating when TurboModule is enabled: facebook/react-native@663b5a8.

@piashcse

This comment has been minimized.

@kelset
Copy link
Member

kelset commented Sep 28, 2020

@piashcse there's a dedicated issue for that #207

@kelset
Copy link
Member

kelset commented Sep 28, 2020

Here's the list of commits we'll attempt to cherry pick for 0.63.3, in chrono order (oldest -> newest):

In the changelog we should also still mention/redirect people to this issue facebook/react-native#29984 in case they have problems with Xcode12

@ravirajn22

This comment has been minimized.

@diegolmello

This comment has been minimized.

@ravirajn22

This comment has been minimized.

@diegolmello

This comment has been minimized.

@mikehardy

This comment has been minimized.

@kelset
Copy link
Member

kelset commented Sep 28, 2020

Status of branch after cherry picking; final list of commits cherry picked:

  1. facebook/react-native@43c161c [asked by @brentvatne in the comment below, to add when process gets re-done]
  2. facebook/react-native@45954ac
  3. facebook/react-native@058eeb4 [added this to remove conflict for next one]
  4. facebook/react-native@ffc90c7
    • this had a conflict but I think I resolved it properly [but if something goes wrong this is the likely culprit, it's a non trivial conflict to resolve]
  5. facebook/react-native@0bcc686
  6. facebook/react-native@dc2df75
  7. facebook/react-native@07a597a
  8. facebook/react-native@86ffb9c
  9. facebook/react-native@d8b70b1
    • conflict here too but on readme and podlock file so resolved easily. The podlock could be removed since in this branch RNTester is not migrated yet (refer to facebook/react-native@63992c0#diff-9a7db2296c1ee161f2e6ca9a41b27903), and the other one is just a readme. Had to add to this version of the commit the refreshed local podlock since we are still in the RNTester folder.
  10. facebook/react-native@83777cb
  11. facebook/react-native@6e08f84
    • another conflict here in the podspec, same problem as above of RNTester not being in the packages folder, so I had to regen the podlock again. Also, in this branch Folly is not yet RTC-Folly so had to fix that too.
  12. facebook/react-native@663b5a8

We will now do some testing both locally and on CI and see if everything goes well. If that's the case, we will proceed with the release.


UPDATE: looks like between the last time I did a release and now someone downgraded my permissions so I can't push to the 0.63 branch... so yeah currently stuck. Either another maintainer will jump in and repeat what I've just done or my auth will be restored. Will let you know once I have updates.


UPDATE 2: looks like my permissions issue will be fixed, but no ETA for it so it's likely that another maintainer will do the cherry picking stuff.


UPDATE 3: permissions have been fixed, I've redone the cherry picking phase to accomodate for Brent's commit (since it's the oldest) and while doing so I've re done the conflicts resolutions in a way that I'm more confident is correct. I've pushed the commits to the remote branch now so that we can have CI tests and other maintainers can also locally do the E2E testing.


UPDATE 4: note to self, we may have to add this facebook/react-native@001eb7c

@brentvatne
Copy link

this may be worth cherry picking as well: facebook/react-native@43c161c

it fixes facebook/react-native#29360

@kelset
Copy link
Member

kelset commented Sep 29, 2020

Allright folks, after all that rollercoaster we finally managed to push through and release 0.63.3! (thanks to @alloy for all the support!)

It's been a wild ride, hopefully now we can focus on getting the final touches ready cutting the 0.64 branch - in case something wild happen, please refer to the new issue: #212

@kelset kelset closed this as completed Sep 29, 2020
@react-native-community react-native-community locked as resolved and limited conversation to collaborators Sep 29, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport request Cherry picking a change into an existing release stable Stable version
Projects
None yet
Development

No branches or pull requests