豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content

Commit 1a74495

Browse files
ergunshDevtools-frontend LUCI CQ
authored andcommitted
Fix CfT binary path in downloadedChromeBinaryPath()
The GCS migration (16d736b) removed the download_chrome.py hook that used to rename extracted directories (e.g. chrome-mac-arm64 → chrome-mac, chrome-win64 → chrome-win). The new GCS deps extract zips directly, preserving the nested arch-specific directory structure. However, downloadedChromeBinaryPath() was not updated to reflect this, breaking `npm start` with --browser=cft. Align the paths with test/conductor/paths.ts::localChromePath() which was correctly updated in the same migration commit. (and I wanted to say hi! 😊) Bug: none Change-Id: If6006625f0d079663aee36f3240d1a6c4af948c5 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7595336 Auto-Submit: Ergün Erdoğmuş <ergunsh@chromium.org> Owners-Override: Nikolay Vitkov <nvitkov@chromium.org> Reviewed-by: Nikolay Vitkov <nvitkov@chromium.org> Commit-Queue: Nikolay Vitkov <nvitkov@chromium.org>
1 parent 4dfe442 commit 1a74495

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

scripts/devtools_paths.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,18 @@ export function tsconfigJsonPath() {
167167
}
168168

169169
export function downloadedChromeBinaryPath() {
170+
const arch = os.arch() === 'arm64' ? 'arm64' : 'x64';
170171
const paths = {
171-
linux: path.join('chrome-linux', 'chrome'),
172+
linux: path.join('chrome-linux', 'chrome-linux64', 'chrome'),
172173
darwin: path.join(
173-
'chrome-mac',
174+
`chrome-mac-${arch}`,
175+
`chrome-mac-${arch}`,
174176
'Google Chrome for Testing.app',
175177
'Contents',
176178
'MacOS',
177179
'Google Chrome for Testing',
178180
),
179-
win32: path.join('chrome-win', 'chrome.exe'),
181+
win32: path.join('chrome-win', 'chrome-win64', 'chrome.exe'),
180182
};
181183
return path.join(devToolsThirdPartyPath(), 'chrome', paths[os.platform()]);
182184
}

0 commit comments

Comments
 (0)