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.

Sign up for GitHub

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

Jump to bottom

[flutter_tools] delete entitlements files after copying to macos build dir #126875

Merged
merged 4 commits into from May 22, 2023
Merged

[flutter_tools] delete entitlements files after copying to macos build dir #126875

merged 4 commits into from May 22, 2023

Conversation

christopherfujino
Copy link
Member

Fixes #126705

@flutter-dashboard flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label May 15, 2023
@XilaiZhang XilaiZhang mentioned this pull request May 16, 2023
Merged
auto-submit bot pushed a commit to flutter/cocoon that referenced this pull request May 16, 2023
@XilaiZhang
[codesign] remove metadata files for now (#2758)
0fc0cd5 
Remove codesign metadata after parsing them.

Context: fix flutter/flutter#126705 by removing codesign metadata after parsing them. When flutter/flutter#126875 becomes ready, we could add back codesign metadata inside engine zips?

Sorry for the delay, was busy landing different cps during the day
@vashworth
Copy link
Contributor

Are the entitlement files not needed anymore once they reach the tool? I haven't seen a purpose for them but could be something I'm unaware of. Asking because seems like your code will remove all entitlement files and not just the one inside the FlutterMacOS.framework

@christopherfujino
Copy link
Member Author

christopherfujino commented May 19, 2023 •
edited

Are the entitlement files not needed anymore once they reach the tool? I haven't seen a purpose for them but could be something I'm unaware of. Asking because seems like your code will remove all entitlement files and not just the one inside the FlutterMacOS.framework

Yes, the only purpose for them is as an input to the codesign tool which runs as part of the engine builds that generate and upload artifacts. @XilaiZhang just made a change to have that tool delete them after use (0fc0cd5)--however I figured we should be safe and delete them on the tool side, as I'm not sure if we codesign on the main channel of the engine.

XilaiZhang
XilaiZhang approved these changes May 19, 2023
View reviewed changes
Copy link
Contributor

@XilaiZhang XilaiZhang left a comment

Choose a reason for hiding this comment

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

images (1)
The is! operator is very cool. today i learnt.
Yeah if we remove the codesign metadata from the tools logic, we might be able to add it back in the initial engine zips so people could reference it when they add new binaries.

@christopherfujino christopherfujino added the autosubmit Merge PR when tree becomes green via auto submit App label May 22, 2023
@auto-submit auto-submit bot merged commit 7e1a0d4 into flutter:master May 22, 2023
124 checks passed
christopherfujino added a commit to christopherfujino/flutter that referenced this pull request May 22, 2023
@christopherfujino
[flutter_tools] delete entitlements files after copying to macos buil…
2b9710d 
…d dir (flutter#126875)

Fixes flutter#126705
@christopherfujino christopherfujino mentioned this pull request May 22, 2023
Merged
auto-submit bot pushed a commit that referenced this pull request May 22, 2023
@christopherfujino
[flutter_tools] delete entitlements files after macos framework - bet…
a6cf7bf 
…a cp (#127349)

Cherrypick of #126875

CP request at #127350

Fixes #126705 for the beta release
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 23, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 23, 2023
@engine-flutter-autoroll
7e1a0d408 [flutter_tools] delete entitlements files after copying to …
976bc20 
…macos build dir (flutter/flutter#126875)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request May 23, 2023
@engine-flutter-autoroll
Roll Flutter from 343718945bcb to f86c529b2cd2 (22 revisions) (#4066)
5bc20b0 
flutter/flutter@3437189...f86c529

2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 431ed51c6415 to 168b0bf3f70d (1 revision) (flutter/flutter#127382)
2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from cc79ae858591 to 431ed51c6415 (1 revision) (flutter/flutter#127381)
2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 311438399a45 to cc79ae858591 (1 revision) (flutter/flutter#127377)
2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from c284cd10e7ab to 311438399a45 (1 revision) (flutter/flutter#127376)
2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8d6602b030be to c284cd10e7ab (2 revisions) (flutter/flutter#127372)
2023-05-23 tessertaha@gmail.com Add M3 date picker tests and fix divider (flutter/flutter#127197)
2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 2586cbeeae37 to 8d6602b030be (2 revisions) (flutter/flutter#127370)
2023-05-23 engine-flutter-autoroll@skia.org Manual roll Flutter Engine from a342a9186e69 to 2586cbeeae37 (14 revisions) (flutter/flutter#127369)
2023-05-23 43054281+camsim99@users.noreply.github.com [Android] Adds `namespace` to module build file templates (flutter/flutter#126963)
2023-05-23 zanderso@users.noreply.github.com Revert Engine to a342a9186e69 (flutter/flutter#127368)
2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 2a325eed77d0 to 41e8d52a006a (2 revisions) (flutter/flutter#127365)
2023-05-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from a342a9186e69 to 2a325eed77d0 (7 revisions) (flutter/flutter#127364)
2023-05-23 parlough@gmail.com Remove null-safety argument from DartPad doc samples (flutter/flutter#127345)
2023-05-22 daniel.iglesia@gmail.com Support keeping a bottom sheet with a DraggableScrollableSheet from closing on drag/fling to min extent (flutter/flutter#127339)
2023-05-22 jacksongardner@google.com Fix wasm-opt location when using local_web_sdk (flutter/flutter#127355)
2023-05-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 1ed9fc0caf55 to a342a9186e69 (3 revisions) (flutter/flutter#127352)
2023-05-22 louisehsu@google.com Show warning when attempting to flutter run on an ios device with developer mode turned off (flutter/flutter#125710)
2023-05-22 ian@hixie.ch Suggest that people move to "beta" when they upgrade on "master" (flutter/flutter#127146)
2023-05-22 andrewrkolos@gmail.com add test for setting JAVA_HOME and PATH when invoking `sdkmanager --licenses` (flutter/flutter#127344)
2023-05-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from e04c14786d5a to 1ed9fc0caf55 (1 revision) (flutter/flutter#127343)
2023-05-22 38299943+VictorOhashi@users.noreply.github.com fix: Search anchor box location when used on nested navigator (flutter/flutter#127198)
2023-05-22 christopherfujino@gmail.com [flutter_tools] delete entitlements files after copying to macos build dir (flutter/flutter#126875)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC bmparr@google.com,rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@christopherfujino christopherfujino deleted the delete-entitlements-files branch May 23, 2023 18:17
@christopherfujino christopherfujino restored the delete-entitlements-files branch May 23, 2023 18:17
@christopherfujino christopherfujino deleted the delete-entitlements-files branch May 23, 2023 18:18
@christopherfujino christopherfujino restored the delete-entitlements-files branch May 23, 2023 18:18
@christopherfujino christopherfujino mentioned this pull request May 23, 2023
Merged
auto-submit bot pushed a commit that referenced this pull request May 23, 2023
@christopherfujino
[flutter_tools] delete entitlements files after copying to macos buil…
11cb291 
…d dir (#127417)

Fixes #126705

Follow up fix after #126875 did NOT work.
christopherfujino added a commit to christopherfujino/flutter that referenced this pull request May 23, 2023
@christopherfujino
[flutter_tools] delete entitlements files after copying to macos buil…
86f8c13 
…d dir (flutter#127417)

Fixes flutter#126705

Follow up fix after flutter#126875 did NOT work.
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request May 24, 2023
@christopherfujino
[flutter_tools] delete entitlements files after copying to macos buil…
0f80c13 
…d dir (flutter#126875)

Fixes flutter#126705
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request May 24, 2023
@christopherfujino
[flutter_tools] delete entitlements files after copying to macos buil…
089bb0a 
…d dir (flutter#127417)

Fixes flutter#126705

Follow up fix after flutter#126875 did NOT work.
@reidbaker reidbaker mentioned this pull request May 25, 2023
Merged
8 tasks
@reidbaker reidbaker mentioned this pull request May 26, 2023
Merged
8 tasks
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2023
@engine-flutter-autoroll
7e1a0d408 [flutter_tools] delete entitlements files after copying to …
4bdde31 
…macos build dir (flutter/flutter#126875)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
7e1a0d408 [flutter_tools] delete entitlements files after copying to …
27a4aa7 
…macos build dir (flutter/flutter#126875)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
7e1a0d408 [flutter_tools] delete entitlements files after copying to …
838fa8e 
…macos build dir (flutter/flutter#126875)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
7e1a0d408 [flutter_tools] delete entitlements files after copying to …
dd90855 
…macos build dir (flutter/flutter#126875)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XilaiZhang XilaiZhang XilaiZhang approved these changes

@vashworth vashworth Awaiting requested review from vashworth

Assignees
No one assigned
Labels
autosubmit Merge PR when tree becomes green via auto submit App tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MacOS builds getting rejected by Apple
3 participants
@christopherfujino @vashworth @XilaiZhang