Skip to content
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.

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

[Release Tooling] Update XCFramework structure #12595

Merged
merged 32 commits into from
Mar 26, 2024
Merged

[Release Tooling] Update XCFramework structure #12595

merged 32 commits into from
Mar 26, 2024

Conversation

ncooke3
Copy link
Member

@ncooke3 ncooke3 commented Mar 20, 2024

Fix #12557

Change zip builder to create macOS/macCatalyst frameworks with the following format:

CoreWaffleVarnishing.framework/
  CoreWaffleVarnishing -> Versions/Current/CoreWaffleVarnishing
  Resources -> Versions/Current/Resources
  Versions/
    Current -> A
    A/
      CoreWaffleVarnishing
      Resources/
        Info.plist
        … other resources …

CocoaPods already creates macOS/macCatalyst frameworks with the above structure, so CP frameworks are now copied rather than manually reconstructed.

@google-oss-bot
Copy link

1 Warning
⚠️ Did you forget to add a changelog entry? (Add #no-changelog to the PR description to silence this warning.)

Generated by 🚫 Danger

@ncooke3 ncooke3 marked this pull request as ready for review March 20, 2024 22:38
@ncooke3 ncooke3 requested a review from paulb777 March 20, 2024 22:38
@ncooke3
Copy link
Member Author

ncooke3 commented Mar 20, 2024

I still need to diff the zip produced by CI against one from a nightly, but this PR is ready for a review.

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.

Nice to make a major fix, delete code, and simplify the implementation for future us!

LGTM on good analysis of a before and after zip diff.

@ncooke3 ncooke3 changed the title [Draft] Update XCFramework structure [Release Tooling] Update XCFramework structure Mar 21, 2024
@ncooke3
Copy link
Member Author

ncooke3 commented Mar 21, 2024

package-head failed with no error logs? I'm building the zip locally as it may be faster than waiting for package-release

@ncooke3 ncooke3 closed this Mar 22, 2024
@ncooke3 ncooke3 reopened this Mar 22, 2024
@ncooke3
Copy link
Member Author

ncooke3 commented Mar 25, 2024

Fix works as of 5bc0ab2. Reverting debug related code.

@ncooke3
Copy link
Member Author

ncooke3 commented Mar 25, 2024

The package-head workflow and its QS tests are now green. 🎉 The package-release hopefully just flaked with a transient error:

[package-release](https://github.com/firebase/firebase-ios-sdk/actions/runs/8423981444/job/23066886526)
The hosted runner: GitHub Actions 482 lost communication with the server. Anything in your workflow that terminates the runner process, starves it for CPU/Memory, or blocks its network access can cause this error.

Kicking off a re-spin now since CI load should be light.

@ncooke3 ncooke3 added this to the 10.24.0 - M146 milestone Mar 26, 2024
@ncooke3
Copy link
Member Author

ncooke3 commented Mar 26, 2024

LGTM on good analysis of a before and after zip diff.

Spot checked zip (ObjC frameowk, Swift framework, absl). Also, performed uploads for the following:

  • iOS app to check for regressions
  • macOS app now uploads to App Store Connect without receiving an email about malformed frameworks.*
  • macCatalyst app now uploads to App Store Connect without receiving an email about malformed frameworks.

*apart from Analytics binaries which weren't built with changes from this PR. I removed them to unblock testing.

@ncooke3 ncooke3 merged commit 973f8df into main Mar 26, 2024
5 checks passed
@ncooke3 ncooke3 deleted the nc/rt-fix branch March 26, 2024 23:18
@ncooke3 ncooke3 linked an issue Mar 27, 2024 that may be closed by this pull request
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://togithub.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://togithub.com/firebase/firebase-ios-sdk/releases/tag/10.24.0):
Firebase Apple 10.24.0

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

#### New Contributors

- [@&#8203;volantwish](https://togithub.com/volantwish) made their first
contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12531](https://togithub.com/firebase/firebase-ios-sdk/pull/12531)
- [@&#8203;mattcomi](https://togithub.com/mattcomi) made their first
contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12580](https://togithub.com/firebase/firebase-ios-sdk/pull/12580)
- [@&#8203;jasesuperhero](https://togithub.com/jasesuperhero) made their
first contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12624](https://togithub.com/firebase/firebase-ios-sdk/pull/12624)
- [@&#8203;Jager-yoo](https://togithub.com/Jager-yoo) made their first
contribution in
[https://github.com/firebase/firebase-ios-sdk/pull/12672](https://togithub.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://togithub.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://togithub.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 Apr 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
3 participants
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy