From 2d13ebc540023bf6b4ed122866b34b410a3e4880 Mon Sep 17 00:00:00 2001 From: "zijiehe@" <68449066+zijiehe-google-com@users.noreply.github.com> Date: Mon, 18 Mar 2024 19:02:51 -0700 Subject: [PATCH 1/4] =?UTF-8?q?Revert=20"Reverts=20"[Fuchsia]=20only=20dow?= =?UTF-8?q?nload=20fuchsia=20deps=20when=20necessary=20(#51439)=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3afc7b1993691a4b59a5c1768e81c8151aab2744. --- .ci.yaml | 12 ++++++++++++ DEPS | 6 ++---- ci/builders/linux_fuchsia.json | 26 -------------------------- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index eac0999d9ea7d..11dbe1b66320b 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -209,6 +209,13 @@ targets: properties: release_build: "true" config_name: linux_fuchsia + # pm in fuchsia-sdk is required when uploading artifacts, so we have to + # download the fuchsia-deps in root builder. + gclient_variables: >- + { + "download_android_deps": false, + "download_fuchsia_deps": true + } # Do not remove(https://github.com/flutter/flutter/issues/144644) # Scheduler will fail to get the platform drone_dimensions: @@ -304,6 +311,11 @@ targets: add_recipes_cq: "true" config_name: linux_license clobber: "true" + # Ensure licenses in fuchsia deps can be correctly processed. + gclient_variables: >- + { + "download_fuchsia_deps": true + } - name: Linux linux_web_engine recipe: engine_v2/engine_v2 diff --git a/DEPS b/DEPS index 89213f76fd99d..34e953b31a5a1 100644 --- a/DEPS +++ b/DEPS @@ -110,9 +110,7 @@ vars = { # Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which # controls the behavior of all fuchsia related flags. I.e. any fuchsia related # logic or condition may not work if this flag is False. - # TODO(zijiehe): Make this condition more strict to only download fuchsia - # dependencies when necessary: b/40935282 - 'download_fuchsia_deps': 'host_os == "linux"', + 'download_fuchsia_deps': False, # Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable # is currently only used for the Fuchsia LSC process and is not intended for # local development. @@ -1210,7 +1208,7 @@ hooks = [ { 'name': 'Download Fuchsia system images', 'pattern': '.', - 'condition': 'run_fuchsia_emu', + 'condition': 'download_fuchsia_deps and run_fuchsia_emu', 'action': [ 'env', 'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}', diff --git a/ci/builders/linux_fuchsia.json b/ci/builders/linux_fuchsia.json index 249ba44090d9e..0f9289732c6d7 100644 --- a/ci/builders/linux_fuchsia.json +++ b/ci/builders/linux_fuchsia.json @@ -5,9 +5,6 @@ "device_type=none", "os=Linux" ], - "gclient_variables": { - "download_android_deps": false - }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -31,7 +28,6 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -68,9 +64,6 @@ "device_type=none", "os=Linux" ], - "gclient_variables": { - "download_android_deps": false - }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -94,7 +87,6 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -131,9 +123,6 @@ "device_type=none", "os=Linux" ], - "gclient_variables": { - "download_android_deps": false - }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -173,7 +162,6 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -210,9 +198,6 @@ "device_type=none", "os=Linux" ], - "gclient_variables": { - "download_android_deps": false - }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -236,7 +221,6 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -273,10 +257,6 @@ "device_type=none", "os=Linux" ], - "gclient_variables": { - "download_android_deps": false, - "run_fuchsia_emu": true - }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -300,7 +280,6 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -337,10 +316,6 @@ "device_type=none", "os=Linux" ], - "gclient_variables": { - "download_android_deps": false, - "run_fuchsia_emu": true - }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -380,7 +355,6 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ From 689678e8a82da6288857da6868b47cbfbfec7f48 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 18 Mar 2024 19:05:19 -0700 Subject: [PATCH 2/4] partially revert --- DEPS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 34e953b31a5a1..96db9ff5f6413 100644 --- a/DEPS +++ b/DEPS @@ -110,7 +110,9 @@ vars = { # Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which # controls the behavior of all fuchsia related flags. I.e. any fuchsia related # logic or condition may not work if this flag is False. - 'download_fuchsia_deps': False, + # TODO(zijiehe): Make this condition more strict to only download fuchsia + # dependencies when necessary: b/40935282 + 'download_fuchsia_deps': 'host_os == "linux"', # Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable # is currently only used for the Fuchsia LSC process and is not intended for # local development. From 3bcdf2867bbfcaba10919b8399ec38b599a99019 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 18 Mar 2024 19:11:11 -0700 Subject: [PATCH 3/4] remove unnecessary gclient variables --- .ci.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 11dbe1b66320b..721b0c2d53a45 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -213,8 +213,7 @@ targets: # download the fuchsia-deps in root builder. gclient_variables: >- { - "download_android_deps": false, - "download_fuchsia_deps": true + "download_android_deps": false } # Do not remove(https://github.com/flutter/flutter/issues/144644) # Scheduler will fail to get the platform @@ -311,11 +310,6 @@ targets: add_recipes_cq: "true" config_name: linux_license clobber: "true" - # Ensure licenses in fuchsia deps can be correctly processed. - gclient_variables: >- - { - "download_fuchsia_deps": true - } - name: Linux linux_web_engine recipe: engine_v2/engine_v2 From c2746ed4ad7d3e5dba354f5d15bda7cde6598bd4 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 18 Mar 2024 19:12:29 -0700 Subject: [PATCH 4/4] remove unncessary comments --- .ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 721b0c2d53a45..8052499408ddb 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -209,8 +209,6 @@ targets: properties: release_build: "true" config_name: linux_fuchsia - # pm in fuchsia-sdk is required when uploading artifacts, so we have to - # download the fuchsia-deps in root builder. gclient_variables: >- { "download_android_deps": false