Merge branch 'main' into add-firefox

.github/workflows/main.yml

@@ -24,10 +24,10 @@ jobs:
         pyodide-version: [0.26.4]
         test-config:
           [
-            { runner: selenium, runtime: chrome, runtime-version: latest },
+            # FIXME: timeouts on recent versions of Chrome, same as micropip
+            { runner: selenium, runtime: chrome, runtime-version: 125 },
             { runner: selenium, runtime: firefox, runtime-version: latest },
           ]
-
     steps:
       - uses: actions/checkout@v4
         with:
@@ -42,44 +42,7 @@ jobs:
           version: ${{ matrix.pyodide-version }}
           to: dist
 
-      # - uses: pyodide/pyodide-actions/install-browser@v1
-      #   with:
-      #     runner: ${{ matrix.test-config.runner }}
-      #     browser: ${{ matrix.test-config.runtime }}
-      #     browser-version: ${{ matrix.test-config.runtime-version }}
-
-      - uses: browser-actions/[email protected]
-        id: setup-chrome
-        if: ${{ matrix.test-config.runtime == 'chrome' }}
-        with:
-          # November 2021, 2024 LTS release
-          chrome-version: 126
-
-      - uses: nanasess/[email protected]
-        with:
-          chromedriver-version: "126.0.6478.182"
-
-      - name: Add Chrome to PATH
-        if: ${{ matrix.test-config.runtime == 'chrome' }}
-        run: |
-          CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}
-          echo "PATH=$CHROME_BIN:$PATH" >> $GITHUB_ENV
-          CHROMEDRIVER_BIN=${{ steps.setup-chrome.outputs.chromedriver-path }}
-          echo "PATH=$CHROMEDRIVER_BIN:$PATH" >> $GITHUB_ENV
-
-      - name: Sanity check Chrome installation
-        if: ${{ matrix.test-config.runtime == 'chrome' }}
-        run: |
-          chromedriver --version
-          chrome --version
-
-      - uses: browser-actions/[email protected]
-        if: ${{ matrix.test-config.runtime == 'firefox' }}
-        with:
-          firefox-version: ${{ matrix.test-config.runtime-version }}
-
-      - uses: browser-actions/setup-geckodriver@latest
-        if: ${{ matrix.test-config.runtime == 'firefox' }}
+      - uses: pyodide/pyodide-actions/install-browser@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -96,10 +59,12 @@ jobs:
             --dist-dir=./dist/ \
             --runner=${{ matrix.test-config.runner }} \
             --rt ${{ matrix.test-config.runtime }}
+
       - uses: codecov/codecov-action@v3
         if: ${{ github.event.repo.name == 'pyodide/matplotlib-pyodide' || github.event_name == 'pull_request' }}
         with:
           fail_ci_if_error: false
+
   deploy:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')