Commit 14d4d215 authored by Chong Gu's avatar Chong Gu Committed by V8 LUCI CQ

[Fuchsia] Switch downloading SDK from GCS to CIPD

Bug: fuchsia:99205
Change-Id: If60cd1c0b24e7c52be82e4c2297b88d9d2482ef4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3630280
Auto-Submit: Chong Gu <chonggu@google.com>
Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Chong Gu <chonggu@google.com>
Cr-Commit-Position: refs/heads/main@{#80401}
parent bd22e3be
...@@ -36,6 +36,9 @@ vars = { ...@@ -36,6 +36,9 @@ vars = {
'check_v8_header_includes': False, 'check_v8_header_includes': False,
'checkout_reclient': False, 'checkout_reclient': False,
# By default, download the fuchsia sdk from the public sdk directory.
'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/gn/',
# reclient CIPD package version # reclient CIPD package version
'reclient_version': 're_client_version:0.40.0.40ff5a5', 'reclient_version': 're_client_version:0.40.0.40ff5a5',
...@@ -45,6 +48,11 @@ vars = { ...@@ -45,6 +48,11 @@ vars = {
# luci-go CIPD package version. # luci-go CIPD package version.
'luci_go': 'git_revision:2aa3d7e5e8662c5193059a490f07b7d91331933e', 'luci_go': 'git_revision:2aa3d7e5e8662c5193059a490f07b7d91331933e',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Fuchsia sdk
# and whatever else without interference from each other.
'fuchsia_version': 'version:8.20220504.0.1',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version # the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other. # and whatever else without interference from each other.
...@@ -216,9 +224,15 @@ deps = { ...@@ -216,9 +224,15 @@ deps = {
}, },
'third_party/depot_tools': 'third_party/depot_tools':
Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '6a1494e5d76a4d03d4a0ba1847110df1a8d1c868', Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '6a1494e5d76a4d03d4a0ba1847110df1a8d1c868',
'third_party/fuchsia-sdk': { 'third_party/fuchsia-sdk/sdk': {
'url': Var('chromium_url') + '/chromium/src/third_party/fuchsia-sdk.git' + '@' + '7c9c220d13ab367d49420144a257886ebfbce278', 'packages': [
{
'package': Var('fuchsia_sdk_cipd_prefix') + '${{platform}}',
'version': Var('fuchsia_version'),
},
],
'condition': 'checkout_fuchsia', 'condition': 'checkout_fuchsia',
'dep_type': 'cipd',
}, },
'third_party/google_benchmark/src': { 'third_party/google_benchmark/src': {
'url': Var('chromium_url') + '/external/github.com/google/benchmark.git' + '@' + '8d86026c67e41b1f74e67c1b20cc8f73871bc76e', 'url': Var('chromium_url') + '/external/github.com/google/benchmark.git' + '@' + '8d86026c67e41b1f74e67c1b20cc8f73871bc76e',
...@@ -580,15 +594,6 @@ hooks = [ ...@@ -580,15 +594,6 @@ hooks = [
'action': ['python3', 'build/util/lastchange.py', 'action': ['python3', 'build/util/lastchange.py',
'-o', 'build/util/LASTCHANGE'], '-o', 'build/util/LASTCHANGE'],
}, },
{
'name': 'Download Fuchsia SDK',
'pattern': '.',
'condition': 'checkout_fuchsia',
'action': [
'python3',
'build/fuchsia/update_sdk.py',
],
},
{ {
'name': 'Download Fuchsia system images', 'name': 'Download Fuchsia system images',
'pattern': '.', 'pattern': '.',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment