ci(0.83): run PR checks on merge branch too#3007
Open
Saadnajmi wants to merge 6 commits into
Open
Conversation
Cherry-pick of react@faeef2b (react#56099). fmt 11.0.2 enables `consteval` on Apple clang ≥ 14 (which includes Xcode 26.4), but Xcode 26.4's stricter clang rejects consteval expressions in fmt's format-inl.h. fmt 12.1.0 fixes this. Changes: - `packages/react-native/third-party-podspecs/fmt.podspec`: 11.0.2 → 12.1.0 - `packages/react-native/third-party-podspecs/RCT-Folly.podspec": fmt dep 11.0.2 → 12.1.0 - `packages/react-native/gradle/libs.versions.toml`: 11.0.2 → 12.1.0 - `packages/rn-tester/Podfile.lock`: updated fmt version + checksum - `scripts/releases/ios-prebuild/configuration.js`: 11.0.2 → 12.1.0 RNTester macOS builds successfully on Xcode 26.4. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add the macOS-only BUILD_FROM_HERMES_COMMIT member to the
HermesEngineSourceTypes type annotation, and inline the
{stdio: 'inherit'} exec options so execSync type-checks (hoisting them
into a variable widened the type and broke the invariant stdio field).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
PressableProps is exact, so passing the deprecated keyboard props raises [incompatible-type] rather than [prop-missing]. Update the suppressions to the correct code so flow-check passes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The 0.83 merge pulled in upstream's imperative focus/blur methods (canBecomeFirstResponder, handleCommand:args:, focus, blur, becomeFirstResponder, resignFirstResponder) without a platform guard, duplicating the macOS-specific implementations already present in the TARGET_OS_OSX block and causing "duplicate declaration" errors on macOS. Guard the upstream block with #if !TARGET_OS_OSX so macOS keeps its own window-based focus handling. Also convert the merged-in SwiftUI-filter code (effectiveContentView, transferVisualPropertiesFromView, hit testing container, drop shadow color) from raw UIView/UIColor to the RCTPlatformView/RCTPlatformColor aliases so the translation unit compiles on macOS. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
Summary:
To aid in the merge
Test Plan:
CI should pass