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

Cherrypick entitlements file fix to 3.24 branch #54585

Conversation

christopherfujino
Copy link
Member

@christopherfujino christopherfujino commented Aug 16, 2024

Fixes flutter/flutter#153532

Cherrypicks #54573 (from flutter-3.24-candidate.1 branch) to the 3.24 stable candidate branch.

In flutter#54414, we added dSYM files for physical and simulator binaries in both regular and extension-safe framework builds, but did not add the dSYMs to the without_entitlements.txt list.

This passed all engine pre/post-submit tests, as well as framework tests, but failed during release codesigning in Cocoon in a test here: https://github.com/flutter/cocoon/blob/d849b14bab90e0f90e2f7667e37c9f9a5696b918/cipd_packages/codesign/lib/src/file_codesign_visitor.dart#L305-L313

This adds the missing files to without_entitlements.txt.

Issue: flutter/flutter#116493

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
@cbracken
Copy link
Member

This looks like a fair bit more than an entitlements fix -- is that expected?

@christopherfujino christopherfujino changed the base branch from main to flutter-3.24-candidate.0 August 16, 2024 19:59
@flutter-dashboard
Copy link

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

@christopherfujino
Copy link
Member Author

This looks like a fair bit more than an entitlements fix -- is that expected?

wrong merge target :)

@itsjustkevin
Copy link
Contributor

This should base from flutter-3.24-candidate.0

Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

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

LGTM stamp from a Japanese personal seal

@christopherfujino christopherfujino added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 16, 2024
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Aug 16, 2024
Copy link
Contributor

auto-submit bot commented Aug 16, 2024

auto label is removed for flutter/engine/54585, due to - The status or check suite Linux Web Framework tests has failed. Please fix the issues identified (or deflake) before re-applying this label.

@cbracken
Copy link
Member

Wb tests are failing with:

[  +13 ms] /b/s/w/ir/x/w/recipe_cleanup/builder/src/flutter/prebuilts/linux-x64/dart-sdk/bin/dartaotruntime --disable-dart-dev /b/s/w/ir/x/w/recipe_cleanup/builder/src/flutter/prebuilts/linux-x64/dart-sdk/bin/snapshots/frontend_server_aot.dart.snapshot --sdk-root /b/s/w/ir/x/w/recipe_cleanup/builder/src/out/wasm_release/flutter_web_sdk/ --incremental --target=dartdevc --experimental-emit-debug-metadata -DDART_HHH_BOT=false -DFLUTTER_WEB_AUTO_DETECT=false -DFLUTTER_WEB_USE_SKIA=false --output-dill /b/s/w/ir/x/t/flutter_tools.WZOPWM/flutter_test.AIVJMG/out --packages /b/s/w/ir/x/w/flutter/packages/flutter/.dart_tool/package_config.json -Ddart.vm.profile=false -Ddart.vm.product=false --enable-asserts --track-widget-creation --filesystem-root /b/s/w/ir/x/w/flutter/packages/flutter/test --filesystem-root /b/s/w/ir/x/t/flutter_tools.WZOPWM/flutter_test.AIVJMG/ --filesystem-scheme org-dartlang-app --initialize-from-dill build/45d48c4c9128ad4b2557fab909a9764a.cache.dill.track.dill --platform file:///b/s/w/ir/x/w/recipe_cleanup/builder/src/out/wasm_release/flutter_web_sdk/kernel/ddc_outline_sound.dill --verbosity=error --sound-null-safety
[  +12 ms] <- compile org-dartlang-app:///main.dart
[ +163 ms] org-dartlang-app:///main.dart:1:1: Error: The specified language version is too high. The highest supported language version is 3.5.
[   +1 ms] // @dart = 3.6
[        ] ^^^^^^^^^^^^^^
[+7065 ms] lib/src/semantics/semantics.dart:2925:7: Error: No named parameter with the name 'linkUrl'.
[        ]       linkUrl: data.linkUrl?.toString() ?? '',
[        ]       ^^^^^^^
[+20072 ms] "flutter test" took 33,153ms.
[   +4 ms] Failed to compile
[        ] 
           #0      throwToolExit (package:flutter_tools/src/base/common.dart:10:3)
           #1      WebTestCompiler._compileJS (package:flutter_tools/src/test/web_test_compiler.dart:194:7)
           <asynchronous suspension>
           #2      _FlutterTestRunnerImpl.runTests (package:flutter_tools/src/test/runner.dart:181:34)
           <asynchronous suspension>
           #3      TestCommand.runCommand (package:flutter_tools/src/commands/test.dart:596:16)
           <asynchronous suspension>
           #4      FlutterCommand.run.<anonymous closure> (package:flutter_tools/src/runner/flutter_command.dart:1432:27)
           <asynchronous suspension>
           #5      AppContext.run.<anonymous closure> (package:flutter_tools/src/base/context.dart:153:19)
           <asynchronous suspension>
           #6      CommandRunner.runCommand (package:args/command_runner.dart:212:13)
           <asynchronous suspension>
           #7      FlutterCommandRunner.runCommand.<anonymous closure> (package:flutter_tools/src/runner/flutter_command_runner.dart:421:9)
           <asynchronous suspension>
           #8      AppContext.run.<anonymous closure> (package:flutter_tools/src/base/context.dart:153:19)
           <asynchronous suspension>
           #9      FlutterCommandRunner.runCommand (package:flutter_tools/src/runner/flutter_command_runner.dart:364:5)
           <asynchronous suspension>
           #10     run.<anonymous closure>.<anonymous closure> (package:flutter_tools/runner.dart:130:9)
           <asynchronous suspension>
           #11     AppContext.run.<anonymous closure> (package:flutter_tools/src/base/context.dart:153:19)
           <asynchronous suspension>
           #12     main (package:flutter_tools/executable.dart:93:3)
           <asynchronous suspension>


[        ] ensureAnalyticsSent: 0ms
[        ] Running 2 shutdown hooks
[  +18 ms] Shutdown hooks complete
[        ] exiting with code 1
╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════
║ Command: ../../bin/flutter test --reporter=expanded --file-reporter=json:/b/s/w/ir/x/t/metrics_1723843425869006.json -v --platform=chrome --web-renderer=html --dart-define=DART_HHH_BOT=false --local-web-sdk /b/s/w/ir/x/w/recipe_cleanup/builder/src/out/wasm_release test/widgets/mark_needs_build_test.dart test/rendering/layer_annotations_test.dart test/widgets/restoration_scope_test.dart test/widgets/binding_live_test.dart test/widgets/implicit_semantics_test.dart test/material/about_test.dart test/material/ink_paint_test.dart test/widgets/fade_transition_test.dart test/material/card_test.dart test/material/autocomplete_test.dart test/material/switch_test.dart test/cupertino/text_field_test.dart test/widgets/texture_test.dart test/material/menu_theme_test.dart test/services/keyboard_maps_test.dart test/widgets/custom_scroll_view_test.dart test/widgets/editable_text_shortcuts_test.dart test/widgets/icon_test.dart test/widgets/draggable_scrollable_sheet_test.dart test/widgets/semantics_clipping_test.dart test/material/snack_bar_theme_test.dart test/material/bottom_app_bar_theme_test.dart test/widgets/modal_barrier_test.dart test/material/persistent_bottom_sheet_test.dart test/widgets/spacer_test.dart test/widgets/basic_test.dart test/widgets/reassemble_test.dart test/widgets/page_forward_transitions_test.dart test/widgets/inherited_test.dart test/widgets/scrollable_test.dart test/painting/geometry_test.dart test/widgets/semantics_5_test.dart test/widgets/key_test.dart test/material/text_theme_test.dart test/widgets/box_decoration_test.dart test/material/card_theme_test.dart test/widgets/state_setting_in_scrollables_test.dart test/painting/image_cache_test.dart test/painting/image_cache_clearing_test.dart test/widgets/gesture_detector_semantics_test.dart test/widgets/shape_decoration_test.dart test/animation/animation_controller_listener_test.dart test/widgets/animated_opacity_repaint_test.dart test/widgets/syncing_test.dart test/material/banner_theme_test.dart test/scheduler/performance_mode_test.dart test/gestures/debug_test.dart test/widgets/implicit_animations_test.dart test/widgets/slivers_appbar_stretch_test.dart test/widgets/disposable_build_context_test.dart test/rendering/slivers_helpers_test.dart test/widgets/list_view_correction_test.dart test/rendering/memory_allocations_test.dart test/widgets/binding_cannot_schedule_frame_test.dart test/cupertino/list_tile_test.dart test/rendering/offstage_test.dart test/painting/image_cache_binding_test.dart test/widgets/form_test.dart test/gestures/double_tap_test.dart test/widgets/scroll_aware_image_provider_test.dart test/widgets/semantics_tester_test.dart test/widgets/keep_alive_test.dart test/material/arc_test.dart test/material/typography_test.dart test/foundation/bit_field_test.dart test/widgets/error_widget_builder_test.dart test/widgets/context_menu_controller_test.dart test/widgets/tap_region_test.dart test/widgets/safe_area_test.dart test/cupertino/route_test.dart test/widgets/slivers_evil_test.dart test/gestures/gesture_binding_resample_event_test.dart test/foundation/basic_types_test.dart test/foundation/diagnostics_test.dart test/widgets/scrollable_in_overlay_test.dart test/widgets/framework_test.dart test/widgets/sliver_appbar_opacity_test.dart test/material/divider_theme_test.dart test/material/text_field_splash_test.dart test/widgets/grid_paper_test.dart test/widgets/wrap_test.dart test/widgets/image_test.dart test/foundation/synchronous_future_test.dart test/widgets/scroll_events_test.dart test/widgets/autocomplete_test.dart test/widgets/rich_text_test.dart test/cupertino/debug_test.dart test/widgets/default_text_style_test.dart test/rendering/view_constraints_test.dart test/material/filled_button_theme_test.dart test/material/floating_action_button_location_test.dart test/material/reorderable_list_test.dart test/services/set_method_call_handler_test.dart test/gestures/monodrag_test.dart test/cupertino/activity_indicator_test.dart test/material/text_button_test.dart test/material/tab_bar_theme_test.dart test/gestures/arena_test.dart test/material/predictive_back_page_transitions_builder_test.dart test/material/refresh_indicator_test.dart test/widgets/build_scope_test.dart test/material/progress_indicator_theme_test.dart test/harness/trivial_test.dart test/material/bottom_navigation_bar_theme_test.dart test/material/carousel_test.dart test/painting/flutter_logo_test.dart test/widgets/scrollable_restoration_test.dart
║ Command exited with exit code 1 but expected zero exit code.
║ Working directory: /b/s/w/ir/x/w/flutter/packages/flutter
╚═══════════════════════════════════════════════════════════════════════════════
╔═╡ERROR #2╞════════════════════════════════════════════════════════════════════
║ UNEXPECTED ERROR!
║ PathNotFoundException: Cannot delete file, path = '/b/s/w/ir/x/t/metrics_1723843425869006.json' (OS Error: No such file or directory, errno = 2)
║ #0      _File.throwIfError (dart:io/file_impl.dart:675:7)
║ #1      _File._deleteSync (dart:io/file_impl.dart:329:5)
║ #2      FileSystemEntity.deleteSync (dart:io/file_system_entity.dart:407:7)
║ #3      ForwardingFileSystemEntity.deleteSync (package:file/src/forwarding/forwarding_file_system_entity.dart:70:16)
║ #4      WebTestsSuite._runFlutterWebTest (file:///b/s/w/ir/x/w/flutter/dev/bots/suite_runners/run_web_tests.dart:709:16)
║ <asynchronous suspension>
║ #5      _runFromList (file:///b/s/w/ir/x/w/flutter/dev/bots/utils.dart:601:5)
║ <asynchronous suspension>
║ #6      WebTestsSuite._runWebUnitTests (file:///b/s/w/ir/x/w/flutter/dev/bots/suite_runners/run_web_tests.dart:675:5)
║ <asynchronous suspension>
║ #7      _runFromList (file:///b/s/w/ir/x/w/flutter/dev/bots/utils.dart:601:5)
║ <asynchronous suspension>
║ #8      main (file:///b/s/w/ir/x/w/flutter/dev/bots/test.dart:127:5)
║ <asynchronous suspension>
║ 
║ The test.dart script should be corrected to catch this error and call foundError().
║ Some tests are likely to have been skipped.
╚═══════════════════════════════════════════════════════════════════════════════

@christopherfujino
Copy link
Member Author

Wb tests are failing with:

[  +13 ms] /b/s/w/ir/x/w/recipe_cleanup/builder/src/flutter/prebuilts/linux-x64/dart-sdk/bin/dartaotruntime --disable-dart-dev /b/s/w/ir/x/w/recipe_cleanup/builder/src/flutter/prebuilts/linux-x64/dart-sdk/bin/snapshots/frontend_server_aot.dart.snapshot --sdk-root /b/s/w/ir/x/w/recipe_cleanup/builder/src/out/wasm_release/flutter_web_sdk/ --incremental --target=dartdevc --experimental-emit-debug-metadata -DDART_HHH_BOT=false -DFLUTTER_WEB_AUTO_DETECT=false -DFLUTTER_WEB_USE_SKIA=false --output-dill /b/s/w/ir/x/t/flutter_tools.WZOPWM/flutter_test.AIVJMG/out --packages /b/s/w/ir/x/w/flutter/packages/flutter/.dart_tool/package_config.json -Ddart.vm.profile=false -Ddart.vm.product=false --enable-asserts --track-widget-creation --filesystem-root /b/s/w/ir/x/w/flutter/packages/flutter/test --filesystem-root /b/s/w/ir/x/t/flutter_tools.WZOPWM/flutter_test.AIVJMG/ --filesystem-scheme org-dartlang-app --initialize-from-dill build/45d48c4c9128ad4b2557fab909a9764a.cache.dill.track.dill --platform file:///b/s/w/ir/x/w/recipe_cleanup/builder/src/out/wasm_release/flutter_web_sdk/kernel/ddc_outline_sound.dill --verbosity=error --sound-null-safety
[  +12 ms] <- compile org-dartlang-app:///main.dart
[ +163 ms] org-dartlang-app:///main.dart:1:1: Error: The specified language version is too high. The highest supported language version is 3.5.
[   +1 ms] // @dart = 3.6
[        ] ^^^^^^^^^^^^^^
[+7065 ms] lib/src/semantics/semantics.dart:2925:7: Error: No named parameter with the name 'linkUrl'.
[        ]       linkUrl: data.linkUrl?.toString() ?? '',
[        ]       ^^^^^^^
[+20072 ms] "flutter test" took 33,153ms.
[   +4 ms] Failed to compile
[        ] 
           #0      throwToolExit (package:flutter_tools/src/base/common.dart:10:3)
           #1      WebTestCompiler._compileJS (package:flutter_tools/src/test/web_test_compiler.dart:194:7)
           <asynchronous suspension>
           #2      _FlutterTestRunnerImpl.runTests (package:flutter_tools/src/test/runner.dart:181:34)
           <asynchronous suspension>
           #3      TestCommand.runCommand (package:flutter_tools/src/commands/test.dart:596:16)
           <asynchronous suspension>
           #4      FlutterCommand.run.<anonymous closure> (package:flutter_tools/src/runner/flutter_command.dart:1432:27)
           <asynchronous suspension>
           #5      AppContext.run.<anonymous closure> (package:flutter_tools/src/base/context.dart:153:19)
           <asynchronous suspension>
           #6      CommandRunner.runCommand (package:args/command_runner.dart:212:13)
           <asynchronous suspension>
           #7      FlutterCommandRunner.runCommand.<anonymous closure> (package:flutter_tools/src/runner/flutter_command_runner.dart:421:9)
           <asynchronous suspension>
           #8      AppContext.run.<anonymous closure> (package:flutter_tools/src/base/context.dart:153:19)
           <asynchronous suspension>
           #9      FlutterCommandRunner.runCommand (package:flutter_tools/src/runner/flutter_command_runner.dart:364:5)
           <asynchronous suspension>
           #10     run.<anonymous closure>.<anonymous closure> (package:flutter_tools/runner.dart:130:9)
           <asynchronous suspension>
           #11     AppContext.run.<anonymous closure> (package:flutter_tools/src/base/context.dart:153:19)
           <asynchronous suspension>
           #12     main (package:flutter_tools/executable.dart:93:3)
           <asynchronous suspension>


[        ] ensureAnalyticsSent: 0ms
[        ] Running 2 shutdown hooks
[  +18 ms] Shutdown hooks complete
[        ] exiting with code 1
╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════
║ Command: ../../bin/flutter test --reporter=expanded --file-reporter=json:/b/s/w/ir/x/t/metrics_1723843425869006.json -v --platform=chrome --web-renderer=html --dart-define=DART_HHH_BOT=false --local-web-sdk /b/s/w/ir/x/w/recipe_cleanup/builder/src/out/wasm_release test/widgets/mark_needs_build_test.dart test/rendering/layer_annotations_test.dart test/widgets/restoration_scope_test.dart test/widgets/binding_live_test.dart test/widgets/implicit_semantics_test.dart test/material/about_test.dart test/material/ink_paint_test.dart test/widgets/fade_transition_test.dart test/material/card_test.dart test/material/autocomplete_test.dart test/material/switch_test.dart test/cupertino/text_field_test.dart test/widgets/texture_test.dart test/material/menu_theme_test.dart test/services/keyboard_maps_test.dart test/widgets/custom_scroll_view_test.dart test/widgets/editable_text_shortcuts_test.dart test/widgets/icon_test.dart test/widgets/draggable_scrollable_sheet_test.dart test/widgets/semantics_clipping_test.dart test/material/snack_bar_theme_test.dart test/material/bottom_app_bar_theme_test.dart test/widgets/modal_barrier_test.dart test/material/persistent_bottom_sheet_test.dart test/widgets/spacer_test.dart test/widgets/basic_test.dart test/widgets/reassemble_test.dart test/widgets/page_forward_transitions_test.dart test/widgets/inherited_test.dart test/widgets/scrollable_test.dart test/painting/geometry_test.dart test/widgets/semantics_5_test.dart test/widgets/key_test.dart test/material/text_theme_test.dart test/widgets/box_decoration_test.dart test/material/card_theme_test.dart test/widgets/state_setting_in_scrollables_test.dart test/painting/image_cache_test.dart test/painting/image_cache_clearing_test.dart test/widgets/gesture_detector_semantics_test.dart test/widgets/shape_decoration_test.dart test/animation/animation_controller_listener_test.dart test/widgets/animated_opacity_repaint_test.dart test/widgets/syncing_test.dart test/material/banner_theme_test.dart test/scheduler/performance_mode_test.dart test/gestures/debug_test.dart test/widgets/implicit_animations_test.dart test/widgets/slivers_appbar_stretch_test.dart test/widgets/disposable_build_context_test.dart test/rendering/slivers_helpers_test.dart test/widgets/list_view_correction_test.dart test/rendering/memory_allocations_test.dart test/widgets/binding_cannot_schedule_frame_test.dart test/cupertino/list_tile_test.dart test/rendering/offstage_test.dart test/painting/image_cache_binding_test.dart test/widgets/form_test.dart test/gestures/double_tap_test.dart test/widgets/scroll_aware_image_provider_test.dart test/widgets/semantics_tester_test.dart test/widgets/keep_alive_test.dart test/material/arc_test.dart test/material/typography_test.dart test/foundation/bit_field_test.dart test/widgets/error_widget_builder_test.dart test/widgets/context_menu_controller_test.dart test/widgets/tap_region_test.dart test/widgets/safe_area_test.dart test/cupertino/route_test.dart test/widgets/slivers_evil_test.dart test/gestures/gesture_binding_resample_event_test.dart test/foundation/basic_types_test.dart test/foundation/diagnostics_test.dart test/widgets/scrollable_in_overlay_test.dart test/widgets/framework_test.dart test/widgets/sliver_appbar_opacity_test.dart test/material/divider_theme_test.dart test/material/text_field_splash_test.dart test/widgets/grid_paper_test.dart test/widgets/wrap_test.dart test/widgets/image_test.dart test/foundation/synchronous_future_test.dart test/widgets/scroll_events_test.dart test/widgets/autocomplete_test.dart test/widgets/rich_text_test.dart test/cupertino/debug_test.dart test/widgets/default_text_style_test.dart test/rendering/view_constraints_test.dart test/material/filled_button_theme_test.dart test/material/floating_action_button_location_test.dart test/material/reorderable_list_test.dart test/services/set_method_call_handler_test.dart test/gestures/monodrag_test.dart test/cupertino/activity_indicator_test.dart test/material/text_button_test.dart test/material/tab_bar_theme_test.dart test/gestures/arena_test.dart test/material/predictive_back_page_transitions_builder_test.dart test/material/refresh_indicator_test.dart test/widgets/build_scope_test.dart test/material/progress_indicator_theme_test.dart test/harness/trivial_test.dart test/material/bottom_navigation_bar_theme_test.dart test/material/carousel_test.dart test/painting/flutter_logo_test.dart test/widgets/scrollable_restoration_test.dart
║ Command exited with exit code 1 but expected zero exit code.
║ Working directory: /b/s/w/ir/x/w/flutter/packages/flutter
╚═══════════════════════════════════════════════════════════════════════════════
╔═╡ERROR #2╞════════════════════════════════════════════════════════════════════
║ UNEXPECTED ERROR!
║ PathNotFoundException: Cannot delete file, path = '/b/s/w/ir/x/t/metrics_1723843425869006.json' (OS Error: No such file or directory, errno = 2)
║ #0      _File.throwIfError (dart:io/file_impl.dart:675:7)
║ #1      _File._deleteSync (dart:io/file_impl.dart:329:5)
║ #2      FileSystemEntity.deleteSync (dart:io/file_system_entity.dart:407:7)
║ #3      ForwardingFileSystemEntity.deleteSync (package:file/src/forwarding/forwarding_file_system_entity.dart:70:16)
║ #4      WebTestsSuite._runFlutterWebTest (file:///b/s/w/ir/x/w/flutter/dev/bots/suite_runners/run_web_tests.dart:709:16)
║ <asynchronous suspension>
║ #5      _runFromList (file:///b/s/w/ir/x/w/flutter/dev/bots/utils.dart:601:5)
║ <asynchronous suspension>
║ #6      WebTestsSuite._runWebUnitTests (file:///b/s/w/ir/x/w/flutter/dev/bots/suite_runners/run_web_tests.dart:675:5)
║ <asynchronous suspension>
║ #7      _runFromList (file:///b/s/w/ir/x/w/flutter/dev/bots/utils.dart:601:5)
║ <asynchronous suspension>
║ #8      main (file:///b/s/w/ir/x/w/flutter/dev/bots/test.dart:127:5)
║ <asynchronous suspension>
║ 
║ The test.dart script should be corrected to catch this error and call foundError().
║ Some tests are likely to have been skipped.
╚═══════════════════════════════════════════════════════════════════════════════

Ok, I think this was broken by https://github.com/flutter/engine/pull/54571/files, which coincidentally didn't run "Linux Web Framework tests"

@christopherfujino
Copy link
Member Author

So, I believe Linux Web Framework Tests was never supposed to run on a release PR, but it was scheduled because I accidentally initially opened this PR against main.

I pushed an empty commit and confirmed that this target was not scheduled.

@christopherfujino christopherfujino added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 19, 2024
@auto-submit auto-submit bot merged commit c9b9d57 into flutter:flutter-3.24-candidate.0 Aug 19, 2024
26 checks passed
@christopherfujino christopherfujino deleted the cherrypicks-flutter-3.24-candidate.0 branch August 19, 2024 20:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects: desktop autosubmit Merge PR when tree becomes green via auto submit App e: impeller platform-ios platform-linux platform-web Code specifically for the web engine platform-windows
Projects
None yet
3 participants