commit 8ab23a276ba98f24a5f9bfc705519c028c2d351d
author Godofredo Contreras <godofredoc@google.com> Wed Jun 15 16:14:12 2022 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 15 16:14:12 2022 +0000
tree 51cf549800b78620151600a614f401a6e99da475
parent 33509df0de581296a7c0a475ccb1323e8d12dcf9

Grab the commit from flutter instead of buildroot.

Bug: https://github.com/flutter/flutter/issues/81855
Change-Id: I649f3810ea9ed0d7a496f2d0a6b96990be0d16cd
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/31163
Reviewed-by: Xilai Zhang <xilaizhang@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Keyong Han <keyonghan@google.com>

recipes/engine_v2/builder.expected/basic_gcs.json

diff --git a/recipes/engine_v2/builder.expected/basic_gcs.json b/recipes/engine_v2/builder.expected/basic_gcs.json
index b2df948..9d66b03 100644
--- a/recipes/engine_v2/builder.expected/basic_gcs.json
+++ b/recipes/engine_v2/builder.expected/basic_gcs.json
@@ -845,7 +845,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/src/flutter",
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",

recipes/engine_v2/builder.py

diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index 842504c..9dad0b6 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -131,7 +131,7 @@
       api.file.ensure_directory('Ensuring %s' % archive_dir.join(rel_path), archive_dir.join(rel_path))
       api.file.copy('Copy %s' % include_path, full_include_path, archive_dir.join(rel_path, base_name))
   if archive_config.get('type') == 'gcs':
-    commit = api.repo_util.get_commit(checkout)
+    commit = api.repo_util.get_commit(checkout.join('flutter'))
     api.gsutil.upload(
         source='%s/*' % archive_dir, bucket='flutter_archives_v2',
         dest='flutter_infra_release/flutter/%s' % commit,  args=['-r'],