Skip to content

fix: find re2 headers#15655

Merged
ncooke3 merged 4 commits intomainfrom
nc/fix-fst-spec
Jan 2, 2026
Merged

fix: find re2 headers#15655
ncooke3 merged 4 commits intomainfrom
nc/fix-fst-spec

Conversation

@ncooke3
Copy link
Member

@ncooke3 ncooke3 commented Jan 2, 2026

Address re2 header related nightlies #15607 (comment)

Gemini Explanation:

  1. CocoaPods Cleanup: When CocoaPods installs a pod, it cleans the source directory by removing any files that are not explicitly declared in the podspec (via source_files, resources, preserve_paths, etc.).
  2. Missing Headers: Before your change, the re2 headers located in Firestore/third_party/re2 were not listed in source_files (since they are excluded or not matched) and were missing from preserve_paths. As a result, CocoaPods deleted them.
  3. Broken Search Path: Although HEADER_SEARCH_PATHS correctly pointed to /Firestore/third_party/re2, the compilation failed because the files had been removed from the disk.
  4. The Fix: Adding 'Firestore/third_party/re2/**/*.h' to preserve_paths explicitly tells CocoaPods to keep these files. This ensures they exist on disk during the build, allowing the compiler to resolve #include re2/re2.h.

Testing

Fixes #15607

#no-changelog

  Explanation:

   1. CocoaPods Cleanup: When CocoaPods installs a pod, it cleans the source directory by removing any files that are not explicitly declared in the podspec (via source_files, resources, preserve_paths, etc.).
   2. Missing Headers: Before your change, the re2 headers located in Firestore/third_party/re2 were not listed in source_files (since they are excluded or not matched) and were missing from preserve_paths. As a result, CocoaPods deleted them.
   3. Broken Search Path: Although HEADER_SEARCH_PATHS correctly pointed to /Firestore/third_party/re2, the compilation failed because the files had been removed from the disk.
   4. The Fix: Adding 'Firestore/third_party/re2/**/*.h' to preserve_paths explicitly tells CocoaPods to keep these files. This ensures they exist on disk during the build, allowing the compiler to resolve #include re2/re2.h.

#no-changelog
@gemini-code-assist
Copy link
Contributor

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

Copy link
Member

@paulb777 paulb777 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Please test locally or trigger CI for one of the failing nightlies to confirm.

This reverts commit 395dc89.
@ncooke3
Copy link
Member Author

ncooke3 commented Jan 2, 2026

I'm going to merge this and see how nightlies respond. I waited for manual (pre)release_cocoapods workflows but realized that I shouldn't have since the tags they were testing do not include this fix. I was able to successfully stage the fixed spec in this PR to SpecsStaging.

Going to merge and move tags.

@ncooke3 ncooke3 merged commit 03ce974 into main Jan 2, 2026
60 of 61 checks passed
@ncooke3 ncooke3 deleted the nc/fix-fst-spec branch January 2, 2026 20:57
@ncooke3 ncooke3 mentioned this pull request Jan 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Nightly Testing Report

2 participants