Merge branch 'main' into drop-serve-devdep

Author: soulgalore

.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:

.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:

.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:

.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:

.github/workflows/mac.yml

@@ -29,15 +29,14 @@ 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/
+      # 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

.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: