From 120e862b1c4c272d97ac1c7925ba879e05f2f9a6 Mon Sep 17 00:00:00 2001 From: William Hesse Date: Mon, 1 May 2023 16:43:09 +0200 Subject: [PATCH] Forward fix for roll of Dart SDK to new checked-in SDK The checked-in SDK downloaded by Dart and engine checkouts from cipd has changed. The cipd package no longer includes dart-sdk at the start of all the paths of its files, so /dart-sdk is added to the path of the cipd download location. The script that automatically copies DEPS changes from the Dart SDK to engine does not handle the download location changing, and drops that entry. This change copies the changed download location and cipd reference from Dart SDK DEPS to engine. A roll of the Dart SDK to a version that does not include this update will fail by removing the changed line, so the next successful roll after this is landed must include Dart SDK commit 88aeaa4fec387ce6993b0bfe54d0d33c41d4554a. Link to this commit is https://dart.googlesource.com/sdk.git/+/88aeaa4fec387ce6993b0bfe54d0d33c41d4554a --- DEPS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 749a381c27be4..97a6f0d011eae 100644 --- a/DEPS +++ b/DEPS @@ -497,8 +497,8 @@ deps = { 'src/third_party/dart/third_party/pkg/yaml_edit': Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'), - 'src/third_party/dart/tools/sdks': - {'packages': [{'version': 'version:3.0.0-417.2.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'}, + 'src/third_party/dart/tools/sdks/dart-sdk': + {'packages': [{'version': 'git_revision:d2b8bf9c2ec1bd479dfd255ae70a62aa723df931', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'}, # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.