Skip to content

Cherry Pick deadlock fix into 063-stable #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Mar 1, 2021
Merged

Cherry Pick deadlock fix into 063-stable #739

merged 4 commits into from
Mar 1, 2021

Conversation

@Saadnajmi
Copy link
Collaborator

@Saadnajmi Saadnajmi commented Mar 1, 2021 •
edited
Loading

Cherry Pick 24c16b1 into 0.63-stable

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

Changelog

[iOS] [Fixed] - Fix deadlock on RCTi18nUtil

Test Plan

Microsoft Reviewers: Open in CodeFlow

@Saadnajmi
Fix Deadlock in RCTi18nUtil (iOS) (microsoft#733)
3faef59 
* Initial Commit

* Fix typo

* Fix default initialization of isRTLAllowed and documentation

* use BOOL, remove superfluous readwrite decorator

* Fix another typo

* Add TODO Marker
@Saadnajmi
Fix Deadlock in RCTi18nUtil (iOS) (microsoft#733)
72acbe1 
* Initial Commit

* Fix typo

* Fix default initialization of isRTLAllowed and documentation

* use BOOL, remove superfluous readwrite decorator

* Fix another typo

* Add TODO Marker
@Saadnajmi
Merge branch '0.63-stable-deadlock-fix' of github.com:Saadnajmi/react…
4b7a655 
…-native-macos into 0.63-stable-deadlock-fix
@Saadnajmi Saadnajmi requested a review from alloy as a code owner March 1, 2021 19:30
@pull-bot
Copy link

pull-bot commented Mar 1, 2021 •
edited
Loading

Warnings
⚠️

❔ Base Branch - The base branch for this PR is something other than master. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on master first and then cherry-pick the commits into the branch for that release. The Releases Guide has more information.

Generated by 🚫 dangerJS against 8ee3953

@Saadnajmi Saadnajmi requested a review from HeyImChris March 1, 2021 21:14
@Saadnajmi
Copy link
Collaborator Author

Saadnajmi commented Mar 1, 2021 •
edited
Loading

@HeyImChris Looks like I did need a pod update on top of just cherry picking my change.
Tests pass now, minus CircleCI hanging

@HeyImChris HeyImChris merged commit 6df0b7d into microsoft:0.63-stable Mar 1, 2021
@Saadnajmi Saadnajmi deleted the 0.63-stable-deadlock-fix branch March 1, 2021 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alloy alloy Awaiting requested review from alloy

1 more reviewer

@HeyImChris HeyImChris HeyImChris approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Saadnajmi @pull-bot @HeyImChris