Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Conversation

@godofredoc
Copy link
Contributor

@godofredoc godofredoc commented Aug 26, 2022

The recipes' macos framework file was including an additional folder coming from the zip file created by the script. This PR is relanding #35623 with an additional flag to avoid zipping twice.

Bug: flutter/flutter#81855
Bug: flutter/flutter#110374

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on
    writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@godofredoc godofredoc requested review from jmagman and zanderso August 26, 2022 22:17
# Zip FlutterMacOS.framework.
if args.zip:
subprocess.check_call([
'zip', '-r', '-y', 'FlutterMacOS.framework.zip',
Copy link
Member

Choose a reason for hiding this comment

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

So -y worked and the symlinks are maintained?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For recipes v2 we'll need a follow up or a work around. The Zip command is correct the problem is in the CAS service that follows symlinks by default. I'm taking a look at the service to see if I can implement some logic to preserve symlinks and if it is too complicated I'll send a follow up to regenerate the symlinks in this script.

parser.add_argument('--x64-out-dir', type=str, required=True)
parser.add_argument('--strip', action="store_true", default=False)
parser.add_argument('--dsym', action="store_true", default=False)
parser.add_argument('--zip', action="store_true", default=False)
Copy link
Member

Choose a reason for hiding this comment

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

flutter/flutter#110374 (comment)

I'll send a PR protecting the creation of the zip file with a flag that will be used only on the recipes v2 builds.

Is that what this is? Maybe a comment and todo to remove once it's adoped?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO added.

@godofredoc godofredoc added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 30, 2022
@auto-submit auto-submit bot merged commit 28e8fe2 into flutter:main Aug 30, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 30, 2022
haroross pushed a commit to haroross/flutter_engine that referenced this pull request Aug 30, 2022
@godofredoc godofredoc deleted the reland_zip_framework branch January 12, 2024 19:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

autosubmit Merge PR when tree becomes green via auto submit App

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants