Commit c1f42696 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[build] Port: Use CIPD packages for GN instead of GCS.

This ports: https://crrev.com/c/1519726

TBR=tmrts@chromium.org

Bug: chromium:930050
Change-Id: I3afcfd28e8fdd5b97946e327997a58a488d4f1a4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1526014Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60272}
parent aaf3eb25
......@@ -10,6 +10,9 @@ vars = {
'download_mips_toolchain': False,
'check_v8_header_includes': False,
# GN CIPD package version.
'gn_version': 'git_revision:0790d3043387c762a6bacb1ae0a9ebe883188ab2',
# luci-go CIPD package version.
'luci_go': 'git_revision:25958d48e89e980e2a97daeddc977fb5e2e1fb8c',
}
......@@ -24,15 +27,45 @@ deps = {
'v8/third_party/instrumented_libraries':
Var('chromium_url') + '/chromium/src/third_party/instrumented_libraries.git' + '@' + 'a959e4f0cb643003f2d75d179cede449979e3e77',
'v8/buildtools':
Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + '62f9eb0d64d6bf48f620b8233d9f7a1dc07f8414',
Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + 'c79f3482c8152172a31e5c17823a27835a511dac',
'v8/buildtools/clang_format/script':
Var('chromium_url') + '/chromium/llvm-project/cfe/tools/clang-format.git' + '@' + '96636aa0e9f047f17447f2d45a094d0b59ed7917',
'v8/buildtools/linux64': {
'packages': [
{
'package': 'gn/gn/linux-amd64',
'version': Var('gn_version'),
}
],
'dep_type': 'cipd',
'condition': 'checkout_linux',
},
'v8/buildtools/mac': {
'packages': [
{
'package': 'gn/gn/mac-amd64',
'version': Var('gn_version'),
}
],
'dep_type': 'cipd',
'condition': 'checkout_mac',
},
'v8/buildtools/third_party/libc++/trunk':
Var('chromium_url') + '/chromium/llvm-project/libcxx.git' + '@' + 'a50f5035629b7621e92acef968403f71b7d48553',
'v8/buildtools/third_party/libc++abi/trunk':
Var('chromium_url') + '/chromium/llvm-project/libcxxabi.git' + '@' + '0d529660e32d77d9111912d73f2c74fc5fa2a858',
'v8/buildtools/third_party/libunwind/trunk':
Var('chromium_url') + '/external/llvm.org/libunwind.git' + '@' + '69d9b84cca8354117b9fe9705a4430d789ee599b',
'v8/buildtools/win': {
'packages': [
{
'package': 'gn/gn/windows-amd64',
'version': Var('gn_version'),
}
],
'dep_type': 'cipd',
'condition': 'checkout_win',
},
'v8/base/trace_event/common':
Var('chromium_url') + '/chromium/src/base/trace_event/common.git' + '@' + '936ba8a963284a6b3737cf2f0474a7131073abee',
'v8/third_party/android_ndk': {
......@@ -226,43 +259,6 @@ hooks = [
'--platform=linux*',
],
},
# Pull GN using checked-in hashes.
{
'name': 'gn_win',
'pattern': '.',
'condition': 'host_os == "win"',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=win32',
'--no_auth',
'--bucket', 'chromium-gn',
'-s', 'v8/buildtools/win/gn.exe.sha1',
],
},
{
'name': 'gn_mac',
'pattern': '.',
'condition': 'host_os == "mac"',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=darwin',
'--no_auth',
'--bucket', 'chromium-gn',
'-s', 'v8/buildtools/mac/gn.sha1',
],
},
{
'name': 'gn_linux',
'pattern': '.',
'condition': 'host_os == "linux"',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-gn',
'-s', 'v8/buildtools/linux64/gn.sha1',
],
},
{
'name': 'wasm_spec_tests',
'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