From b72a9c6c9bee763d92dd13ddce7d5b92bfbe5896 Mon Sep 17 00:00:00 2001 From: bairov pavel Date: Fri, 24 Nov 2023 05:49:29 +0200 Subject: [PATCH 1/2] add button for download console logs (#4007) Co-authored-by: Peter Hedenskog --- lib/plugins/html/templates/url/iteration/downloads.pug | 3 +++ lib/plugins/html/templates/url/summary/downloads.pug | 5 ++++- lib/plugins/html/templates/url/summary/index.pug | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/plugins/html/templates/url/iteration/downloads.pug b/lib/plugins/html/templates/url/iteration/downloads.pug index e0a7002550..e906a2b1e1 100644 --- a/lib/plugins/html/templates/url/iteration/downloads.pug +++ b/lib/plugins/html/templates/url/iteration/downloads.pug @@ -12,3 +12,6 @@ if d.browsertime && d.browsertime.har if options.browsertime.chrome && options.browsertime.chrome.collectNetLog - const netlogPath = 'data/chromeNetlog-' + (iteration ? iteration : 1) + '.json.gz' a.button.button-download(href=netlogPath, download=downloadName + '-netlog.json.gz') Download netlog +if options.browsertime.chrome && options.browsertime.chrome.collectConsoleLog + - const consoleLogPath = 'data/console-' + (iteration ? iteration : 1) + '.json.gz' + a.button.button-download(href=consoleLogPath, download=downloadName + '-consoleLogs.json.gz') Download Console Logs diff --git a/lib/plugins/html/templates/url/summary/downloads.pug b/lib/plugins/html/templates/url/summary/downloads.pug index a158834c6b..e5424cde12 100644 --- a/lib/plugins/html/templates/url/summary/downloads.pug +++ b/lib/plugins/html/templates/url/summary/downloads.pug @@ -11,4 +11,7 @@ if d.browsertime && d.browsertime.har - const harEnding = options.gzipHAR ? '.har.gz' : '.har' - const harName = 'data/browsertime' + harEnding - const harDownloadName = downloadName + harEnding - a.button.button-download(href=harName, download=harDownloadName) Download HAR + a.button.button-download(href=harName, download=harDownloadName) Download HAR +if options.browsertime.chrome && options.browsertime.chrome.collectConsoleLog + - const consoleLogPath = 'data/console-' + (runNumber? runNumber : 1) + '.json.gz' + a.button.button-download(href=consoleLogPath, download=downloadName + '-consoleLogs.json.gz') Download Console Logs diff --git a/lib/plugins/html/templates/url/summary/index.pug b/lib/plugins/html/templates/url/summary/index.pug index 32a7b94156..9df3ef49ce 100644 --- a/lib/plugins/html/templates/url/summary/index.pug +++ b/lib/plugins/html/templates/url/summary/index.pug @@ -67,6 +67,9 @@ block content if d.browsertime && d.browsertime.har a(href='#downloads') Download HAR |  |  + if options.browsertime.chrome && options.browsertime.chrome.collectConsoleLog + a(href='#downloads') Download Console Logs + |  |  a#summary h2 Summary From 1f0cf123b15e4dec9b75ae8437d600f0b375db6d Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Fri, 24 Nov 2023 04:49:58 +0100 Subject: [PATCH 2/2] Use Firefox 120 (#4010) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 02790b5db8..5500817034 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM sitespeedio/webbrowsers:chrome-119.0-firefox-119.0-edge-119.0 +FROM sitespeedio/webbrowsers:chrome-119.0-firefox-120.0-edge-119.0 ARG TARGETPLATFORM=linux/amd64