From 14572ec244c5a6069bf828deae22830e76dacf53 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Sun, 13 Sep 2026 23:58:03 +0200 Subject: [PATCH 1/3] Use FFmpeg 8.1 in CI Change-Id: Ia0c2a024e4ab9a073be6bed470c91f6a3f4aeac5 --- .github/workflows/browser-beta.yml | 2 +- .github/workflows/browser-dev.yml | 2 +- .github/workflows/linux-chrome.yml | 2 +- .github/workflows/linux-firefox.yml | 2 +- .github/workflows/windows.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/browser-beta.yml b/.github/workflows/browser-beta.yml index 34bfbcc32..4bb7366fd 100644 --- a/.github/workflows/browser-beta.yml +++ b/.github/workflows/browser-beta.yml @@ -33,7 +33,7 @@ jobs: - name: Install ffmpeg uses: AnimMouse/setup-ffmpeg@ae28d57dabbb148eff63170b6bf7f2b60062cbae # v1.2.3 with: - version: '7.1' + version: '8.1' - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6 with: diff --git a/.github/workflows/browser-dev.yml b/.github/workflows/browser-dev.yml index a45d5bffa..802b7a3b1 100644 --- a/.github/workflows/browser-dev.yml +++ b/.github/workflows/browser-dev.yml @@ -33,7 +33,7 @@ jobs: - name: Install ffmpeg uses: AnimMouse/setup-ffmpeg@ae28d57dabbb148eff63170b6bf7f2b60062cbae # v1.2.3 with: - version: '7.1' + version: '8.1' - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6 with: diff --git a/.github/workflows/linux-chrome.yml b/.github/workflows/linux-chrome.yml index 3f174b205..dabe219a4 100644 --- a/.github/workflows/linux-chrome.yml +++ b/.github/workflows/linux-chrome.yml @@ -291,7 +291,7 @@ jobs: - name: Install ffmpeg uses: AnimMouse/setup-ffmpeg@ae28d57dabbb148eff63170b6bf7f2b60062cbae # v1.2.3 with: - version: '7.1' + version: '8.1' - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6 with: diff --git a/.github/workflows/linux-firefox.yml b/.github/workflows/linux-firefox.yml index 00faa5398..db79eef58 100644 --- a/.github/workflows/linux-firefox.yml +++ b/.github/workflows/linux-firefox.yml @@ -44,7 +44,7 @@ jobs: - name: Install ffmpeg uses: AnimMouse/setup-ffmpeg@ae28d57dabbb148eff63170b6bf7f2b60062cbae # v1.2.3 with: - version: '7.1' + version: '8.1' - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6 with: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bfd2b8313..72206369e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -25,7 +25,7 @@ jobs: - name: Install ffmpeg uses: AnimMouse/setup-ffmpeg@ae28d57dabbb148eff63170b6bf7f2b60062cbae # v1.2.3 with: - version: '7.1' + version: '8.1' - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6 with: From f4927b55a5eb1ea0c488a6d2e4ed08b47e212239 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Mon, 14 Sep 2026 00:20:55 +0200 Subject: [PATCH 2/3] Install current browsers on the macOS Intel runner Change-Id: Ic9b809a3f9c0c7ffb1e663a6ae94bb5e7df6972d --- .github/workflows/mac.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index e279f75d5..0f038fcd2 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -29,13 +29,11 @@ jobs: python-version: '3.11' cache: 'pip' - name: Install browsers - env: - HOMEBREW_NO_AUTO_UPDATE: 1 run: | - brew install --cask google-chrome & - brew install --cask firefox & - brew install --cask microsoft-edge & - wait + brew update + brew install --cask google-chrome firefox microsoft-edge + brew upgrade --cask --greedy google-chrome firefox microsoft-edge + "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version - name: Test Chrome run: ./bin/browsertime.js -b chrome -n 1 https://www.sitespeed.io/ - name: Test Firefox From d73ef50cdf8e3a53b1c7de193028c88361e18447 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Mon, 14 Sep 2026 07:00:14 +0200 Subject: [PATCH 3/3] hepp Change-Id: I94da1e1e261180d7606d1c520c5a25fb74b63cc7 --- .github/workflows/mac.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 0f038fcd2..e9c10e34b 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -35,7 +35,8 @@ jobs: brew upgrade --cask --greedy google-chrome firefox microsoft-edge "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version - name: Test Chrome - run: ./bin/browsertime.js -b chrome -n 1 https://www.sitespeed.io/ + # Chromedriver prefers Chrome for Testing from the runner image, so point to the installed Chrome + run: ./bin/browsertime.js -b chrome -n 1 --chrome.binaryPath "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" https://www.sitespeed.io/ - name: Test Firefox run: ./bin/browsertime.js -b firefox -n 1 https://www.sitespeed.io/ - name: Test Edge