Skip to content

[Windows] Allow overwriting the cache's Dart SDK archive license file - #132669

Merged
auto-submit[bot] merged 12 commits into
flutter:masterfrom
loic-sharma:windows_update_hang
Aug 17, 2023
Merged

[Windows] Allow overwriting the cache's Dart SDK archive license file#132669
auto-submit[bot] merged 12 commits into
flutter:masterfrom
loic-sharma:windows_update_hang

Conversation

@loic-sharma

@loic-sharmaloic-sharma commented Aug 16, 2023•
edited
Loading

Copy link
Copy Markdown
Member

flutter-team-archive/engine#43974 added a license file to the Dart SDK's ZIP archive which gets extracted to flutter/bin/cache/LICENSE.dart_sdk_archive.md. As a result, extracting the Dart SDK now needs to update the cache's LICENSE.dart_sdk_archive.md file.

Windows ZIP extraction does not enable overwriting files. Thus, this change renames the cache's existing Dart SDK license file before extracting the Dart SDK archive.

This is a short-term solution that will be cherry-picked for the next 3.14 beta release. Addresses #132592.

The long-term solution is tracked by #132702

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, including Features we expect every widget to implement.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

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

@Hixie

Hixie commented Aug 16, 2023

Copy link
Copy Markdown
Contributor

would it be more resilient to future changes if we had a more general way of doing this rather than needing to know the exactly list of files we were expecting?

@github-actionsgithub-actionsBot added the tool Affects the "flutter" command-line tool. See also t: labels. label Aug 16, 2023
christopherfujino
christopherfujino reviewed Aug 16, 2023
View reviewed changes
Comment threadpackages/flutter_tools/test/integration.shard/batch_entrypoint_test.dart Outdated
christopherfujino
christopherfujino reviewed Aug 16, 2023
View reviewed changes
Comment threadpackages/flutter_tools/test/integration.shard/batch_entrypoint_test.dart Outdated
christopherfujino
christopherfujino reviewed Aug 16, 2023
View reviewed changes
Comment threadpackages/flutter_tools/test/integration.shard/batch_entrypoint_test.dart Outdated
@loic-sharma
loic-sharma marked this pull request as ready for review August 17, 2023 00:09
@loic-sharmaloic-sharma added the platform-windows Building on or for Windows specifically label Aug 17, 2023
@loic-sharma

loic-sharma commented Aug 17, 2023

Copy link
Copy Markdown
MemberAuthor

would it be more resilient to future changes if we had a more general way of doing this rather than needing to know the exactly list of files we were expecting?

Summary of this Discord conversation: This fix is time sensitive as it unblocks the 3.14 beta release. A more robust solution is tracked by #132702.

christopherfujino
christopherfujino approved these changes Aug 17, 2023
View reviewed changes

@christopherfujinochristopherfujino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@christopherfujinochristopherfujino mentioned this pull request Aug 17, 2023
Closed
@loic-sharmaloic-sharma added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 17, 2023
@auto-submit
auto-submitBot merged commit 7ee864e into flutter:masterAug 17, 2023
loic-sharma added a commit to loic-sharma/flutter that referenced this pull request Aug 17, 2023
@loic-sharma
[Windows] Allow overwriting the cache's Dart SDK archive license file (…
6961977
…flutter#132669)
flutter-team-archive/engine#43974 added a license file to the Dart SDK's ZIP archive. As a result, extracting the Dart SDK now needs to overwrite the cache's `LICENSE.dart_sdk_archive.md` file.
This is a short-term solution that will be cherry-picked for the next [3.14 beta release](flutter#132267). Addresses flutter#132592.
The long-term solution is tracked by flutter#132702
@loic-sharma
loic-sharma deleted the windows_update_hang branch August 17, 2023 16:23
@loic-sharmaloic-sharma mentioned this pull request Aug 17, 2023
Merged
8 tasks
@yaakovschectman

yaakovschectman commented Aug 17, 2023

Copy link
Copy Markdown
Contributor

This is introducing test failures for the windows, linux, and mac framework_test_libraries on the tree build.

yaakovschectman added a commit that referenced this pull request Aug 17, 2023
@yaakovschectman
Revert "[Windows] Allow overwriting the cache's Dart SDK archive lice…
49a95af
…nse file (#132669)"
This reverts commit 7ee864e.
@yaakovschectmanyaakovschectman mentioned this pull request Aug 17, 2023
Merged
auto-submitBot pushed a commit that referenced this pull request Aug 17, 2023
@yaakovschectman
Revert "[Windows] Allow overwriting the cache's Dart SDK archive lice…
e10d74b
…nse file" (#132773)
Reverts #132669
Introduced failure on `windows/mac/linux framework_library_tests`.
```
05:41 +7318 ~22 -1: /b/s/w/ir/x/w/flutter/packages/flutter/test/material/menu_bar_theme_test.dart: (tearDownAll) [E] Expected: leak free
Actual: <Instance of 'Leaks'>
Which: contains leaks:
# The text is generated by leak_tracker.
# For leak troubleshooting tips open:
# https://github.com/dart-lang/leak_tracker/blob/main/doc/TROUBLESHOOT.md
notDisposed:
total: 3
objects:
ValueNotifier<_OverlayEntryWidgetState?>:
test: Constructor parameters override theme parameters
identityHashCode: 407433615
FocusScopeNode:
test: Constructor parameters override theme parameters
identityHashCode: 513181650
FocusScopeNode:
test: Constructor parameters override theme parameters
identityHashCode: 704743556
package:matcher expect
package:flutter_test/src/widget_tester.dart 458:18 expect
package:leak_tracker_flutter_testing/src/leak_tracking_flutter_testing.dart 81:5 _tearDownTestingWithLeakTracking
===== asynchronous gap ===========================
dart:async _CustomZone.registerBinaryCallback
package:leak_tracker_flutter_testing/src/leak_tracking_flutter_testing.dart 59:9 configureLeakTrackingTearDown.<fn>
```
auto-submitBot pushed a commit that referenced this pull request Aug 17, 2023
@loic-sharma
[CP] [Windows] Allow overwriting the cache's Dart SDK archive license…
a62bb1f
… file (#132762)
Original pull request: #132669
Cherrypick issue: #132718
@christopherfujinochristopherfujino mentioned this pull request Aug 17, 2023
Closed
loic-sharma added a commit to loic-sharma/flutter that referenced this pull request Aug 17, 2023
@loic-sharma
[Windows] Allow overwriting the cache's Dart SDK archive license file (…
a91d4a4
…flutter#132669)
flutter-team-archive/engine#43974 added a license file to the Dart SDK's ZIP archive. As a result, extracting the Dart SDK now needs to overwrite the cache's `LICENSE.dart_sdk_archive.md` file.
This is a short-term solution that will be cherry-picked for the next [3.14 beta release](flutter#132267). Addresses flutter#132592.
The long-term solution is tracked by flutter#132702
@loic-sharmaloic-sharma mentioned this pull request Aug 17, 2023
Merged
8 tasks
auto-submitBot pushed a commit that referenced this pull request Aug 17, 2023
@loic-sharma
[Windows] Allow overwriting the cache's Dart SDK archive license file… (
9e67e0e
#132777)
Relands #132669 after it was reverted by #132773. The test failures were fixed separately by #132766
Tracking issue: #132592
Cherrypick issue: #132718
@engine-flutter-autorollengine-flutter-autoroll mentioned this pull request Aug 17, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
7ee864e[Windows] Allow overwriting the cache's Dart SDK archive lice…
94dfab1
…nse file (flutter/flutter#132669)
@engine-flutter-autorollengine-flutter-autoroll mentioned this pull request Aug 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 18, 2023
@engine-flutter-autoroll
7ee864e[Windows] Allow overwriting the cache's Dart SDK archive lice…
593b71d
…nse file (flutter/flutter#132669)
@engine-flutter-autorollengine-flutter-autoroll mentioned this pull request Aug 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 18, 2023
@engine-flutter-autoroll
7ee864e[Windows] Allow overwriting the cache's Dart SDK archive lice…
435571b
…nse file (flutter/flutter#132669)
@engine-flutter-autorollengine-flutter-autoroll mentioned this pull request Aug 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 18, 2023
@engine-flutter-autoroll
7ee864e[Windows] Allow overwriting the cache's Dart SDK archive lice…
0582f7b
…nse file (flutter/flutter#132669)
@engine-flutter-autorollengine-flutter-autoroll mentioned this pull request Aug 18, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 18, 2023
@engine-flutter-autoroll
7ee864e[Windows] Allow overwriting the cache's Dart SDK archive lice…
fbb45f2
…nse file (flutter/flutter#132669)
@HansMullerHansMuller mentioned this pull request Aug 25, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 15, 2023
@engine-flutter-autoroll
7ee864e[Windows] Allow overwriting the cache's Dart SDK archive lice…
e61d1a9
…nse file (flutter/flutter#132669)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cbrackencbrackenAwaiting requested review from cbracken
2 more reviewers
@christopherfujinochristopherfujinochristopherfujino approved these changes
@yaakovschectmanyaakovschectmanyaakovschectman approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmitMerge PR when tree becomes green via auto submit Appplatform-windowsBuilding on or for Windows specificallytoolAffects 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.

4 participants

@loic-sharma@Hixie@yaakovschectman@christopherfujino