Use Chrome for Testing instead of Chromium binaries
To reduce complexity, the folder names within the CfT archives are
simplified as follows:
- chrome-win64 → chrome-win
- chrome-mac-{arm64,x64} → chrome-mac
- chrome-linux64 → chrome-linux
Bug: chromium:1465312
Change-Id: I984e818d58ef6dd16b44db022eefcb55b5afce50
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/4724028
Auto-Submit: Mathias Bynens <mathias@chromium.org>
Reviewed-by: Liviu Rau <liviurau@chromium.org>
Commit-Queue: Liviu Rau <liviurau@chromium.org>
diff --git a/DEPS b/DEPS
index 74e87eb..297b621 100644
--- a/DEPS
+++ b/DEPS
@@ -47,7 +47,7 @@
# Chrome version used for tests. It should be regularly updated to
# match the Canary version listed here:
# https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
- 'chrome': '117.0.5912.0',
+ 'chrome': '117.0.5907.0',
}
# Only these hosts are allowed for dependencies in this DEPS file.
@@ -305,10 +305,12 @@
'condition': 'host_os == "win" and build_with_chromium == False',
'action': [ 'python3',
'scripts/deps/download_chrome.py',
- 'https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/win64/chrome-win64.zip',
- 'third_party/chrome',
- 'chrome-win64/chrome.exe',
- Var('chrome'),
+ '--url=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/win64/chrome-win64.zip',
+ '--target=third_party/chrome',
+ '--rename_from=chrome-win64',
+ '--rename_to=chrome-win',
+ '--path_to_binary=chrome-win/chrome.exe',
+ '--version_number=' + Var('chrome'),
],
},
{
@@ -317,10 +319,12 @@
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu != "arm64"',
'action': [ 'python3',
'scripts/deps/download_chrome.py',
- 'https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/mac-x64/chrome-mac-x64.zip',
- 'third_party/chrome',
- 'chrome-mac-x64/Google Chrome for Testing.app/Contents',
- Var('chrome'),
+ '--url=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/mac-x64/chrome-mac-x64.zip',
+ '--target=third_party/chrome',
+ '--rename_from=chrome-mac-x64',
+ '--rename_to=chrome-mac',
+ '--path_to_binary=chrome-mac/Google Chrome for Testing.app/Contents',
+ '--version_number=' + Var('chrome'),
],
},
{
@@ -329,10 +333,12 @@
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu == "arm64"',
'action': [ 'python3',
'scripts/deps/download_chrome.py',
- 'https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/mac-arm64/chrome-mac-arm64.zip',
- 'third_party/chrome',
- 'chrome-mac-arm64/Google Chrome for Testing.app/Contents',
- Var('chrome'),
+ '--url=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/mac-arm64/chrome-mac-arm64.zip',
+ '--target=third_party/chrome',
+ '--rename_from=chrome-mac-arm64',
+ '--rename_to=chrome-mac',
+ '--path_to_binary=chrome-mac/Google Chrome for Testing.app/Contents',
+ '--version_number=' + Var('chrome'),
],
},
{
@@ -341,10 +347,12 @@
'condition': 'host_os == "linux" and build_with_chromium == False',
'action': [ 'python3',
'scripts/deps/download_chrome.py',
- 'https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/linux64/chrome-linux64.zip',
- 'third_party/chrome',
- 'chrome-linux64/chrome',
- Var('chrome'),
+ '--url=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/' + Var('chrome') + '/linux64/chrome-linux64.zip',
+ '--target=third_party/chrome',
+ '--rename_from=chrome-linux64',
+ '--rename_to=chrome-linux',
+ '--path_to_binary=chrome-linux/chrome',
+ '--version_number=' + Var('chrome'),
],
},