From b08b37d747b3f45532c7c2764bfdde04422ac6d9 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 1 Feb 2024 23:36:42 +0000 Subject: [PATCH 1/3] Manual roll Dart SDK from 82936dcdaf4f to 5a5d4c262200 (2 revisions) Manual roll requested by kevinjchisholm@google.com https://dart.googlesource.com/sdk.git/+log/82936dcdaf4f..5a5d4c262200 2024-02-01 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.4.0-99.0.dev 2024-02-01 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.4.0-98.0.dev If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/dart-sdk-flutter-engine Please CC dart-vm-team@google.com,kevinjchisholm@google.com,matanl@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter Engine: 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 --- DEPS | 6 +++--- ci/licenses_golden/excluded_files | 2 ++ ci/licenses_golden/licenses_dart | 4 ++-- sky/packages/sky_engine/LICENSE | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 5cd2c35e1e492..c738c2af76990 100644 --- a/DEPS +++ b/DEPS @@ -62,7 +62,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '82936dcdaf4f8e01fa40962ae5786622c13b8702', + 'dart_revision': '5a5d4c2622007c10ed6adcd5787eb3a69dd8ada4', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -378,7 +378,7 @@ deps = { Var('dart_git') + '/dart_style.git@633b01cba68f4b42ddc2985c3d521c22149d5ce3', 'src/third_party/dart/third_party/pkg/dartdoc': - Var('dart_git') + '/dartdoc.git@0f13e6443595f8e49cc86d783210d78c93d3502e', + Var('dart_git') + '/dartdoc.git@5cac62b6071c899d52553fcd417ca5faeeb507c1', 'src/third_party/dart/third_party/pkg/file': Var('dart_git') + '/external/github.com/google/file.dart@cd3a9324f6483f313ba1f0f3ff382ea4e6982ef2', @@ -429,7 +429,7 @@ deps = { Var('dart_git') + '/native.git@0eafd544d6ebce07b42007560ae9e0858c885d89', 'src/third_party/dart/third_party/pkg/package_config': - Var('dart_git') + '/package_config.git@33dd24659147bd7ed2fa87aeacc52d199be766b4', + Var('dart_git') + '/package_config.git@5a0bc197fde3db2907d0e35e0470e601bee20845', 'src/third_party/dart/third_party/pkg/path': Var('dart_git') + '/path.git@57a049cff2e2be7a302dd9683b2b194c6d06e2d4', diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index ad05a09048740..8b2ce85cc1ab3 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -166,6 +166,8 @@ ../../../flutter/impeller/geometry/size_unittests.cc ../../../flutter/impeller/geometry/trig_unittests.cc ../../../flutter/impeller/golden_tests/README.md +../../../flutter/impeller/golden_tests_harvester/.dart_tool +../../../flutter/impeller/golden_tests_harvester/pubspec.lock ../../../flutter/impeller/image/README.md ../../../flutter/impeller/playground ../../../flutter/impeller/renderer/backend/gles/test diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart index 5f6a59649f32d..fe61abd2e3973 100644 --- a/ci/licenses_golden/licenses_dart +++ b/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: 2c005d749b65ecc8add010e6a96f988f +Signature: 861a39d085cdd353f8ae6398d9c1e393 ==================================================================================================== LIBRARY: dart @@ -4705,7 +4705,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/fbf1d8ebceb475179e0445edde13d9400b62aca0 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/5a5d4c2622007c10ed6adcd5787eb3a69dd8ada4 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index a343e54580ce8..ff03fe182f69c 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -31312,7 +31312,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/82936dcdaf4f8e01fa40962ae5786622c13b8702 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/5a5d4c2622007c10ed6adcd5787eb3a69dd8ada4 /third_party/fallback_root_certificates/ -------------------------------------------------------------------------------- From e2a2d011751256d308978d9ac02c37f4e6b05f3e Mon Sep 17 00:00:00 2001 From: Kevin Chisholm Date: Thu, 1 Feb 2024 18:13:33 -0600 Subject: [PATCH 2/3] Update excluded_files --- ci/licenses_golden/excluded_files | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 8b2ce85cc1ab3..9ead2f852227e 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -167,7 +167,6 @@ ../../../flutter/impeller/geometry/trig_unittests.cc ../../../flutter/impeller/golden_tests/README.md ../../../flutter/impeller/golden_tests_harvester/.dart_tool -../../../flutter/impeller/golden_tests_harvester/pubspec.lock ../../../flutter/impeller/image/README.md ../../../flutter/impeller/playground ../../../flutter/impeller/renderer/backend/gles/test From 62407db9f780d1f88fd06d087452a52624fefe5f Mon Sep 17 00:00:00 2001 From: Kevin Chisholm Date: Thu, 1 Feb 2024 18:16:10 -0600 Subject: [PATCH 3/3] Update excluded_files --- ci/licenses_golden/excluded_files | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 9ead2f852227e..ad05a09048740 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -166,7 +166,6 @@ ../../../flutter/impeller/geometry/size_unittests.cc ../../../flutter/impeller/geometry/trig_unittests.cc ../../../flutter/impeller/golden_tests/README.md -../../../flutter/impeller/golden_tests_harvester/.dart_tool ../../../flutter/impeller/image/README.md ../../../flutter/impeller/playground ../../../flutter/impeller/renderer/backend/gles/test