Replace luci-go dependency to CIPD package
This is needed to be compatible with chromium change, see bug for details. BUG=chromium:851596 Change-Id: I7b3ffda3715e925c42f4b95a2ba1d3f5cf829fda Reviewed-on: https://webrtc-review.googlesource.com/c/113504 Commit-Queue: Artem Titarenko <artit@webrtc.org> Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Reviewed-by: Artem Titarenko <artit@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25933}
This commit is contained in:

committed by
Commit Bot

parent
10b051083c
commit
60d770f2ef
59
DEPS
59
DEPS
@ -37,6 +37,10 @@ vars = {
|
|||||||
# the commit queue can handle CLs rolling HarfBuzz
|
# the commit queue can handle CLs rolling HarfBuzz
|
||||||
# and whatever else without interference from each other.
|
# and whatever else without interference from each other.
|
||||||
'harfbuzz_revision': '79e7e3445efef2dc57f8a10c7e355e802af08868',
|
'harfbuzz_revision': '79e7e3445efef2dc57f8a10c7e355e802af08868',
|
||||||
|
# Three lines of non-changing comments so that
|
||||||
|
# the commit queue can handle CLs rolling luci-go CIPD package version
|
||||||
|
# and whatever else without interference from each other.
|
||||||
|
'luci_go': 'git_revision:fdf05508e8a66c773a41521e0243c9d11b9a2a1c',
|
||||||
}
|
}
|
||||||
deps = {
|
deps = {
|
||||||
# TODO(kjellander): Move this to be Android-only once the libevent dependency
|
# TODO(kjellander): Move this to be Android-only once the libevent dependency
|
||||||
@ -416,6 +420,24 @@ deps = {
|
|||||||
'dep_type': 'cipd',
|
'dep_type': 'cipd',
|
||||||
},
|
},
|
||||||
|
|
||||||
|
'src/tools/luci-go': {
|
||||||
|
'packages': [
|
||||||
|
{
|
||||||
|
'package': 'infra/tools/luci/isolate/${{platform}}',
|
||||||
|
'version': Var('luci_go'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'package': 'infra/tools/luci/isolated/${{platform}}',
|
||||||
|
'version': Var('luci_go'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'package': 'infra/tools/luci/swarming/${{platform}}',
|
||||||
|
'version': Var('luci_go'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
'dep_type': 'cipd',
|
||||||
|
},
|
||||||
|
|
||||||
# Everything coming after this is automatically updated by the auto-roller.
|
# Everything coming after this is automatically updated by the auto-roller.
|
||||||
# === ANDROID_DEPS Generated Code Start ===
|
# === ANDROID_DEPS Generated Code Start ===
|
||||||
# Generated by //tools/android/roll/android_deps/fetch_all.py
|
# Generated by //tools/android/roll/android_deps/fetch_all.py
|
||||||
@ -1332,43 +1354,6 @@ hooks = [
|
|||||||
'-s', 'src/build/toolchain/win/rc/linux64/rc.sha1',
|
'-s', 'src/build/toolchain/win/rc/linux64/rc.sha1',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
# Pull luci-go binaries (isolate, swarming) using checked-in hashes.
|
|
||||||
{
|
|
||||||
'name': 'luci-go_win',
|
|
||||||
'pattern': '.',
|
|
||||||
'condition': 'host_os == "win"',
|
|
||||||
'action': [ 'download_from_google_storage',
|
|
||||||
'--no_resume',
|
|
||||||
'--platform=win32',
|
|
||||||
'--no_auth',
|
|
||||||
'--bucket', 'chromium-luci',
|
|
||||||
'-d', 'src/tools/luci-go/win64',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'name': 'luci-go_mac',
|
|
||||||
'pattern': '.',
|
|
||||||
'condition': 'host_os == "mac"',
|
|
||||||
'action': [ 'download_from_google_storage',
|
|
||||||
'--no_resume',
|
|
||||||
'--platform=darwin',
|
|
||||||
'--no_auth',
|
|
||||||
'--bucket', 'chromium-luci',
|
|
||||||
'-d', 'src/tools/luci-go/mac64',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'name': 'luci-go_linux',
|
|
||||||
'pattern': '.',
|
|
||||||
'condition': 'host_os == "linux"',
|
|
||||||
'action': [ 'download_from_google_storage',
|
|
||||||
'--no_resume',
|
|
||||||
'--platform=linux*',
|
|
||||||
'--no_auth',
|
|
||||||
'--bucket', 'chromium-luci',
|
|
||||||
'-d', 'src/tools/luci-go/linux64',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
'name': 'msan_chained_origins',
|
'name': 'msan_chained_origins',
|
||||||
'pattern': '.',
|
'pattern': '.',
|
||||||
|
Reference in New Issue
Block a user