[codesign] fix typo in binary path #51339
Conversation
|
It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!). If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix? Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
sky/tools/create_macos_framework.py
Outdated
| @@ -220,7 +220,7 @@ def zip_framework(dst, args): | |||
| def zip_xcframework_archive(dst): | |||
| filepath_with_entitlements = '' | |||
| filepath_without_entitlements = ( | |||
| 'FlutterMacOS.xcframework/macos-arm64_x84_64/' | |||
| 'FlutterMacOS.xcframework/macos-arm64_x84_64/FlutterMacOS.framework/Versions/A/FlutterMacOS' | |||
There was a problem hiding this comment.
Ooof, this was my bad. It's not that the path isn't complete, it's that it needs to be x86, not x84
| 'FlutterMacOS.xcframework/macos-arm64_x84_64/FlutterMacOS.framework/Versions/A/FlutterMacOS' | |
| 'FlutterMacOS.xcframework/macos-arm64_x86_64/' |
There was a problem hiding this comment.
Thanks for the catch! Do you happen to have a built zip file of xcframework that I could take a look? (just to double check its file structure)
I thought if there is a binary inside the xcframework folder we would use the full path to the binary
There was a problem hiding this comment.
There was a problem hiding this comment.
Perfect, yeah this would work!
sky/tools/create_macos_framework.py
Outdated
| @@ -220,7 +220,7 @@ def zip_framework(dst, args): | |||
| def zip_xcframework_archive(dst): | |||
| filepath_with_entitlements = '' | |||
| filepath_without_entitlements = ( | |||
| 'FlutterMacOS.xcframework/macos-arm64_x84_64/' | |||
| 'FlutterMacOS.xcframework/macos-arm64_x86_64/FlutterMacOS.framework/Versions/A/FlutterMacOS' | |||
There was a problem hiding this comment.
Still need to remove the /FlutterMacOS.framework/Versions/A/FlutterMacOS, that's continued on the next line (line 224)
| 'FlutterMacOS.xcframework/macos-arm64_x86_64/FlutterMacOS.framework/Versions/A/FlutterMacOS' | |
| 'FlutterMacOS.xcframework/macos-arm64_x86_64/' |
There was a problem hiding this comment.
Done. Ah so there is only 1 binary in the xcframework zip file?
There was a problem hiding this comment.
I think you have to keep it on 2 lines to pass the formatting linter
There was a problem hiding this comment.
Done. Ah so there is only 1 binary in the xcframework zip file?
Yes, there's only FlutterMacOS.xcframework/macos-arm64_x86_64/FlutterMacOS.framework/Versions/A/FlutterMacOS
There was a problem hiding this comment.
I think it needs to looks like this or linter may get mad about the line being too long
filepath_without_entitlements = (
'FlutterMacOS.xcframework/macos-arm64_x86_64/'
'FlutterMacOS.framework/Versions/A/FlutterMacOS'
)There was a problem hiding this comment.
Ah I see what you are saying now, done
XilaiZhang
changed the title
XilaiZhang
added
the
autosubmit
### Issue Link: What is the link to the issue this cherry-pick is addressing? release failure at [link](https://ci.chromium.org/ui/p/dart-internal/builders/flutter/Mac%20engine_release_builder/536/overview) ### Changelog Description: Explain this cherry pick in one line that is accessible to most Flutter developers. See [best practices](https://github.com/flutter/flutter/wiki/Hotfix-Documentation-Best-Practices) for examples Fix typo in the binary path of xcframework artifact. ### Impact Description: What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch) would block the release on codesign error. ### Workaround: Is there a workaround for this issue? revert the [xcframework pr](73a6e07#diff-16e49048cfbb998545e3493d5e3148c515b02de6fb894945df457756a6d9099a) and cherry pick would also work. but we can do a fix forward. ### Risk: What is the risk level of this cherry-pick? - [ x ] Low ### Test Coverage: Are you confident that your fix is well-tested by automated tests? - [ x ] Yes ### Validation Steps: What are the steps to validate that this fix works? codesign test should pass in release workflow
…ions) (#145006) Manual roll requested by zra@google.com flutter/engine@6771307...af1fd17 2024-03-12 34871572+gmackall@users.noreply.github.com Try making android scenario app not do animations (flutter/engine#51349) 2024-03-12 skia-flutter-autoroll@skia.org Roll Dart SDK from 7a2c94fd0a26 to c97f2b303259 (1 revision) (flutter/engine#51345) 2024-03-12 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from L6_XzizcJqjneCvGA... to UR-nKoLidl7cVLrrN... (flutter/engine#51344) 2024-03-12 30870216+gaaclarke@users.noreply.github.com [Impeller] implements blur styles for gradients (flutter/engine#51264) 2024-03-11 xilaizhang@google.com [codesign] fix typo in binary path (flutter/engine#51339) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from L6_XzizcJqjn to UR-nKoLidl7c If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC bdero@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
failure in release: link
Updates x84 to x86