Merge branch 'main' into new-network-idle

sitespeedio · Aug 1, 2023 · 50298aa · 50298aa
2 parents cf9b1fd + c8827e7
commit 50298aa
Show file tree

Hide file tree

Showing 8 changed files with 442 additions and 423 deletions.
diff --git a/.github/workflows/building-docker.yml b/.github/workflows/building-docker.yml
@@ -7,9 +7,12 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1
+        uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: Windows Edge
+#name: Windows Edge
 on:
   push:
     branches:
@@ -43,6 +43,9 @@ jobs:
     - name: Run Chrome test
       run: node bin/browsertime.js -b chrome -n 1 https://www.sitespeed.io/
       shell: cmd
+    - name: Run Chrome with config file
+      run: node bin/browsertime.js -b chrome https://www.sitespeed.io/ --config test/data/exampleConfig.json 
+      shell: cmd
     - name: Run Chrome test for multi pages
       run: node bin/browsertime.js -b chrome -n 1 test/data/navigationscript/simple.cjs
       shell: cmd

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## UNRELEASED
+
+### Fixed
+* Updated to Selenium 4.11.1 [#1978](https://github.com/sitespeedio/browsertime/pull/1978).
+
+## 17.14.2 - 2022-07-31
+### Fixed
+* The auto build of release Docker container was broken so no tagged containers was pushed.
+
+## 17.14.1 - 2022-07-31
+
+### Fixed
+* Default jimp resize didn't handle large values (2000) when running in Docker AMD on a ARM machine so changing to another algorithm (HERMITE) [#1977](https://github.com/sitespeedio/browsertime/pull/1977).
+
+* Update: chrome-har, dayjs, execa, chrome-remote-interface and jimp [#1976](https://github.com/sitespeedio/browsertime/pull/1976).
+
+## 17.14.0 - 2022-07-24
+
+### Added
+* Edge and Edgedriver 115 [#1973](https://github.com/sitespeedio/browsertime/pull/1973).
+
 ## 17.13.1 - 2022-07-22
 
 ### Tech

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM sitespeedio/webbrowsers:chrome-115.0-firefox-115.0-edge-114.0 
+FROM sitespeedio/webbrowsers:chrome-115.0-firefox-115.0-edge-115.0 
 
 ARG TARGETPLATFORM=linux/amd64
 

diff --git a/lib/support/images/index.js b/lib/support/images/index.js
@@ -32,12 +32,11 @@ export async function savePng(
   }
 
   if (jimp) {
-    const buffer = await jimp.default.read(data).then(image => {
-      return image
-        .deflateLevel(config.png.compressionLevel)
-        .scaleToFit(config.maxSize, config.maxSize)
-        .getBufferAsync('image/png');
-    });
+    const image = await jimp.default.read(data);
+    const buffer = await image
+      .deflateLevel(config.png.compressionLevel)
+      .scaleToFit(config.maxSize, config.maxSize, jimp.default.RESIZE_HERMITE)
+      .getBufferAsync('image/png');
 
     return storageManager.writeData(
       `${name}.png`,
@@ -62,12 +61,12 @@ export async function saveJpg(
     jimp = undefined;
   }
   if (jimp) {
-    const buffer = await jimp.default.read(data).then(image => {
-      return image
-        .quality(config.jpg.quality)
-        .scaleToFit(config.maxSize, config.maxSize)
-        .getBufferAsync('image/jpeg');
-    });
+    const image = await jimp.default.read(data);
+    // https://github.com/sitespeedio/sitespeed.io/issues/3922
+    const buffer = await image
+      .quality(config.jpg.quality)
+      .scaleToFit(config.maxSize, config.maxSize, jimp.default.RESIZE_HERMITE)
+      .getBufferAsync('image/jpeg');
     return storageManager.writeData(
       `${name}.jpg`,
       buffer,