Skip to content

[Release Tooling] Fix METADATA.md regression introduced in #12595 #12661

New issue

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

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

Already on GitHub? # to your account

Merged
merged 8 commits into from
Apr 2, 2024

Conversation

ncooke3
Copy link
Member

@ncooke3 ncooke3 commented Mar 29, 2024

#no-changelog

When the tooling looks for resources, it was doing a recursive search and finding the Resources directories in all of the macOS/macCatalyst directories (introduced in #12595). Since #12595, every macOS/macCatalyst framework has a Resources directory to contain the framework-level Info.plist (this plist lives at the root of the .framework for other platforms). See below:

Screenshot 2024-03-29 at 9 05 19 AM

From Apple Developer - Placing content in a bundle

So, to fix METADATA.md saying that everything product has resources, do a shallow search in each product directory at the root of the Firebase.zip. The resulting METADATA.md should match the 10.23.0 METADATA.md.

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 on good diff

@ncooke3 ncooke3 enabled auto-merge (squash) April 2, 2024 17:35
@ncooke3 ncooke3 merged commit 6238c93 into main Apr 2, 2024
59 of 60 checks passed
@ncooke3 ncooke3 deleted the nc/rt-metadata-fix branch April 2, 2024 17:35
@ncooke3
Copy link
Member Author

ncooke3 commented Apr 2, 2024

Merging what I had as it is a partial fix. GoogleSignIn is now the only one (relative to 10.23.0) in METADATA.md that doesn't have the resources blurb that should. Will open a separate PR to debug.

@ncooke3
Copy link
Member Author

ncooke3 commented Apr 2, 2024

Upon closer inspection, it looks like the latest GSI release is bundling the previous resources with the privacy manifest (https://github.com/google/GoogleSignIn-iOS/blob/a7965d134c5d3567026c523e0a8a583f73b62b0d/GoogleSignIn.podspec#L40C47-L40C56). This has the side effect of our release tooling seeing the privacy manifest and placing the bundle in the framework. So, this PR is sufficient.

cgrindel-self-hosted-renovate bot referenced this pull request in cgrindel/rules_swift_package_manager Apr 9, 2024
….24.0" (#1007)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
|
[firebase/firebase-ios-sdk](https://github.com/firebase/firebase-ios-sdk)
| minor | `from: "10.23.1"` -> `from: "10.24.0"` |

---

### Release Notes

<details>
<summary>firebase/firebase-ios-sdk (firebase/firebase-ios-sdk)</summary>

###
[`v10.24.0`](https://github.com/firebase/firebase-ios-sdk/releases/tag/10.24.0):
Firebase Apple 10.24.0

[Compare
Source](https://github.com/firebase/firebase-ios-sdk/compare/10.23.1...10.24.0)

The Firebase Apple SDK (10.24.0) is now available. For more details, see
the [Firebase Apple SDK release
notes.](https://firebase.google.com/support/release-notes/ios#10.24.0)

To install this SDK, see [Add Firebase to your
project.](https://firebase.google.com/docs/ios/setup)

#### What's Changed

- Remove calls to fstat in crashlytics by
[@&#8203;volantwish](https://github.com/volantwish) in
[https://github.com/firebase/firebase-ios-sdk/pull/12531](https://github.com/firebase/firebase-ios-sdk/pull/12531)
- fix unit tests by
[@&#8203;themiswang](https://github.com/themiswang) in
[https://github.com/firebase/firebase-ios-sdk/pull/12553](https://github.com/firebase/firebase-ios-sdk/pull/12553)
- \[Release] Add release note for signed artifact changes by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12558](https://github.com/firebase/firebase-ios-sdk/pull/12558)
- Fix typo by [@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12565](https://github.com/firebase/firebase-ios-sdk/pull/12565)
- \[Firestore] Add a check to ensure FirestoreInternal has same public
headers as Firestore by [@&#8203;ncooke3](https://github.com/ncooke3)
in
[https://github.com/firebase/firebase-ios-sdk/pull/12575](https://github.com/firebase/firebase-ios-sdk/pull/12575)
- Carthage 10.23.0 by [@&#8203;paulb777](https://github.com/paulb777)
in
[https://github.com/firebase/firebase-ios-sdk/pull/12588](https://github.com/firebase/firebase-ios-sdk/pull/12588)
- Initial CI for visionOS by
[@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12578](https://github.com/firebase/firebase-ios-sdk/pull/12578)
- Upgrade cmake build to grpc 162 by
[@&#8203;wu-hui](https://github.com/wu-hui) in
[https://github.com/firebase/firebase-ios-sdk/pull/12417](https://github.com/firebase/firebase-ios-sdk/pull/12417)
- More visionOS CI by [@&#8203;paulb777](https://github.com/paulb777)
in
[https://github.com/firebase/firebase-ios-sdk/pull/12608](https://github.com/firebase/firebase-ios-sdk/pull/12608)
- Update versions for Release 10.24.0 by
[@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12594](https://github.com/firebase/firebase-ios-sdk/pull/12594)
- \[Release Tooling] Update XCFramework structure by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12595](https://github.com/firebase/firebase-ios-sdk/pull/12595)
- \[Docs] Update `FirebaseCore/CHANGELOG.md` with correct issue # by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12639](https://github.com/firebase/firebase-ios-sdk/pull/12639)
- Adds putFileHandle and putFileHandleAsync by
[@&#8203;mattcomi](https://github.com/mattcomi) in
[https://github.com/firebase/firebase-ios-sdk/pull/12580](https://github.com/firebase/firebase-ios-sdk/pull/12580)
- \[CocoaPods] Lock FirestoreInternal version to Firestore by
[@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12654](https://github.com/firebase/firebase-ios-sdk/pull/12654)
- Merge 10.23.1 by [@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12655](https://github.com/firebase/firebase-ios-sdk/pull/12655)
- \[Crashlytics] Fix missing Swift header error by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12659](https://github.com/firebase/firebase-ios-sdk/pull/12659)
- Move MIEQ to composite index tests by
[@&#8203;milaGGL](https://github.com/milaGGL) in
[https://github.com/firebase/firebase-ios-sdk/pull/12416](https://github.com/firebase/firebase-ios-sdk/pull/12416)
- feat: add basic support to build frameworks and zip them for the Apple
Watch by [@&#8203;jasesuperhero](https://github.com/jasesuperhero) in
[https://github.com/firebase/firebase-ios-sdk/pull/12624](https://github.com/firebase/firebase-ios-sdk/pull/12624)
- Release note for watchOS zip/Carthage by
[@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12670](https://github.com/firebase/firebase-ios-sdk/pull/12670)
- \[Crashlytics] Remove mach_absolute_time usages by
[@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12664](https://github.com/firebase/firebase-ios-sdk/pull/12664)
- Update to SwiftFormat 0.53.5 by
[@&#8203;paulb777](https://github.com/paulb777) in
[https://github.com/firebase/firebase-ios-sdk/pull/12665](https://github.com/firebase/firebase-ios-sdk/pull/12665)
- Fix typo: Timout -> Timeout by
[@&#8203;Jager-yoo](https://github.com/Jager-yoo) in
[https://github.com/firebase/firebase-ios-sdk/pull/12672](https://github.com/firebase/firebase-ios-sdk/pull/12672)
- \[Crashlytics] Regenerate privacy manifest by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12675](https://github.com/firebase/firebase-ios-sdk/pull/12675)
- \[Release] Version changelog entries for 10.24.0 by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12677](https://github.com/firebase/firebase-ios-sdk/pull/12677)
- \[Release Tooling] Fix METADATA.md regression introduced in
[#&#8203;12595](https://github.com/firebase/firebase-ios-sdk/issues/12595)
by [@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12661](https://github.com/firebase/firebase-ios-sdk/pull/12661)
- Analytics 10.24.0 by
[@&#8203;tsunghung](https://github.com/tsunghung) in
[https://github.com/firebase/firebase-ios-sdk/pull/12693](https://github.com/firebase/firebase-ios-sdk/pull/12693)
- \[Release] Update binary SPM Firestore distro for 10.24.0 by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12708](https://github.com/firebase/firebase-ios-sdk/pull/12708)
- \[Release] Update Firestore's binary deps in Package.swift by
[@&#8203;ncooke3](https://github.com/ncooke3) in
[https://github.com/firebase/firebase-ios-sdk/pull/12709](https://github.com/firebase/firebase-ios-sdk/pull/12709)

#### New Contributors

- [@&#8203;volantwish](https://github.com/volantwish) made their first
contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12531](https://github.com/firebase/firebase-ios-sdk/pull/12531)
- [@&#8203;mattcomi](https://github.com/mattcomi) made their first
contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12580](https://github.com/firebase/firebase-ios-sdk/pull/12580)
- [@&#8203;jasesuperhero](https://github.com/jasesuperhero) made their
first contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12624](https://github.com/firebase/firebase-ios-sdk/pull/12624)
- [@&#8203;Jager-yoo](https://github.com/Jager-yoo) made their first
contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12672](https://github.com/firebase/firebase-ios-sdk/pull/12672)

**Full Changelog**:
firebase/firebase-ios-sdk@10.23.1...10.24.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://github.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDkuNCIsInVwZGF0ZWRJblZlciI6IjM2LjEwOS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
@firebase firebase locked and limited conversation to collaborators May 3, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants