From 21f01aa3d5d171f7e5deb5262480bb6ae20e3d0c Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Mon, 16 Nov 2026 15:31:54 +0800 Subject: [PATCH] fix(ci): `webkit2gtk-driver` is now `webkitgtk-webdriver` on ubuntu 26 (#3785) * fix(ci): `webkit2gtk-driver` is now `webkitgtk-webdriver` on ubuntu 26 * bump pnpm just in case * format --- .github/workflows/test-api-e2e.yml | 2 +- package.json | 2 +- packages/api-e2e/README.md | 4 +- pnpm-lock.yaml | 142 +++++++++++++++++++++-------- 4 files changed, 108 insertions(+), 42 deletions(-) diff --git a/.github/workflows/test-api-e2e.yml b/.github/workflows/test-api-e2e.yml index fa50829a5..3737724bb 100644 --- a/.github/workflows/test-api-e2e.yml +++ b/.github/workflows/test-api-e2e.yml @@ -70,7 +70,7 @@ jobs: sudo apt-get update sudo apt-get install -y \ libwebkit2gtk-4.1-dev \ - webkit2gtk-driver \ + webkitgtk-webdriver \ libgtk-3-dev \ libayatana-appindicator3-dev \ librsvg2-dev \ diff --git a/package.json b/package.json index 97b4546bf..78242392d 100644 --- a/package.json +++ b/package.json @@ -29,5 +29,5 @@ "typescript-eslint": "8.72.1" }, "minimumReleaseAge": 4320, - "packageManager": "pnpm@12.3.4" + "packageManager": "pnpm@12.21.0" } diff --git a/packages/api-e2e/README.md b/packages/api-e2e/README.md index 44275d8c1..19810a01a 100644 --- a/packages/api-e2e/README.md +++ b/packages/api-e2e/README.md @@ -22,7 +22,7 @@ in the core repository; the `@tauri-apps/api` modules themselves are covered the (registered in `examples/api` behind its off-by-default `automation` Cargo feature, which the suite's build enables) and a locally-running `@crabnebula/test-runner-backend`, authenticated with `CN_API_KEY`. - - **Linux** — `webkit2gtk-driver` (`WebKitWebDriver` on `PATH`). + - **Linux** — `webkit2gtk-driver` / `webkitgtk-webdriver` (>= Ubuntu 26.04) (`WebKitWebDriver` on `PATH`). - **Windows** — `msedgedriver.exe` on `PATH`. It hands the app the `--remote-debugging-port` it attaches to through `WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS`, which WebView2 ignores in an elevated process ([wry#1782](https://github.com/tauri-apps/wry/issues/1782)), so the suite has @@ -122,7 +122,7 @@ Platform driver dependencies: | Platform | Requirement | | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | macOS | `CN_API_KEY` env var (CrabNebula Cloud). The automation plugin and test-runner-backend are wired up already. | -| Linux | `webkit2gtk-driver` package (provides `WebKitWebDriver`). | +| Linux | `webkit2gtk-driver` / `webkitgtk-webdriver` (>= Ubuntu 26.04) package (provides `WebKitWebDriver`). | | Windows | `msedgedriver.exe` matching your Edge version, on `PATH`. Run the suite unelevated. | | Android | The usual Tauri Android setup (`ANDROID_HOME`, `NDK_HOME`, a JDK), which also provides the `adb` the suite shells out to, plus a running emulator or a connected device with USB debugging. Network access the first time, for the chromedriver download. | | iOS | macOS with Xcode and an iOS simulator runtime. The first session compiles WebDriverAgent (a few minutes). | diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc661a3fa..4b0b317bd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,96 +7,162 @@ importers: configDependencies: {} packageManagerDependencies: pnpm: - specifier: 12.3.4 - version: 12.3.4 + specifier: 12.21.0 + version: 12.21.0 packages: - '@pnpm/exe.darwin-arm64@12.3.4': - resolution: {integrity: sha512-PAyUol8T1+/+ViOiXAt51ECA+QnfXCqz6foL4bW+LsoX0NcVd5XVEM2mRQu+LV4oc7uRz9zf9U0P+XFfuQeDAw==} + '@pnpm/exe.android-arm64@12.21.0': + resolution: {integrity: sha512-iaWidxR5B9NUBpwMznCQu1yUpKB6BjTY5BYX2lORj76VsfINdj8Z8XWSzSNrGI8qlxa28Jzdp5fiaspzOaJZlA==} + cpu: [arm64] + os: [android] + + '@pnpm/exe.android-x64@12.21.0': + resolution: {integrity: sha512-35e5v3wlwjIYxDywq+R6/z8CE4gLOEgRxt18yqz1tMRLmx2mnW+CFJI2Q8+srTNjn7gykXUC0x1k195JNikC5A==} + cpu: [x64] + os: [android] + + '@pnpm/exe.darwin-arm64@12.21.0': + resolution: {integrity: sha512-F5OyMX/6zLSowpTZEQRojbCmPS1Pq+fyRaIinslsIe6Glh3qbyQ52u+Fe0eEzSaRuIbWZkXmAAXSWh6Q5Wrlgg==} cpu: [arm64] os: [darwin] - '@pnpm/exe.darwin-x64@12.3.4': - resolution: {integrity: sha512-fxP9JCk0Cdye+ePuj+GJJLMUMTqHGWRdb1dtv4How876uQ2ehxvenpgiYAir/ceO9PsYUZkFTtyZdx+rRu5QOA==} + '@pnpm/exe.darwin-x64@12.21.0': + resolution: {integrity: sha512-EzpvcsaE6hrrgYeEiAFYd2rSgFybYyxXhkAY7K3y6Hg3loVfcyJ81hHczpFzi8lW5RXtUlFECRPZ8ZAMRFQYYg==} cpu: [x64] os: [darwin] - '@pnpm/exe.linux-arm64-musl@12.3.4': - resolution: {integrity: sha512-FBOt0/7ye6O6q4AllVV5QMviB6qE6fqkeczV/+MDWQsmo+QJrlfsh6X7CpH/tClVpBZEyIbjpUoT8bNhCYBxEg==} + '@pnpm/exe.freebsd-x64@12.21.0': + resolution: {integrity: sha512-wNjuEnmdLks4aayPu/QZWQ5tQM9Jn+odUp/vwQM8BXRYoulkTZhtZTHoD60N6mUdLWef1hgUeUh8llNGEUsimw==} + cpu: [x64] + os: [freebsd] + + '@pnpm/exe.linux-arm64-musl@12.21.0': + resolution: {integrity: sha512-Ceit9zn4g5ZqCJtx1fV8eJE7p8aeXMrGZ+Dc01vRqZLIUNgNeI+Ur0ruyqxtsnJx6rGADyXzohumxPLHjaJ5AQ==} cpu: [arm64] os: [linux] libc: [musl] - '@pnpm/exe.linux-arm64@12.3.4': - resolution: {integrity: sha512-t71AVA7LRqiKTyZ5xMYaZc2n5DfdpMbfokZuiIOXHBOM03ECnF0t4iYwaBDqJgVjlKYUOwaF/bRQajGNA4cJ4w==} + '@pnpm/exe.linux-arm64@12.21.0': + resolution: {integrity: sha512-4Oj/iF2TDCe2lcH0n4TupPR5sSdrNLclJB6xBElLMPCUOAvBhdf2rRlSaO5M4erJ6g4Fyy7YTXTpcmfFsKyxEA==} cpu: [arm64] os: [linux] libc: [glibc] - '@pnpm/exe.linux-x64-musl@12.3.4': - resolution: {integrity: sha512-RPmk7Jb/aYaFvL2iyDN/AtMY+hUEsue732WmXpcuQ9tBpMnGyA5py7Z3+e+qmQaJ0zY/4ni9jJiyPBQHujmv6w==} + '@pnpm/exe.linux-ppc64@12.21.0': + resolution: {integrity: sha512-s2o7rdSDeUTBFsNqxptpZXlTgT6cojmMVUOvTQvFNSv6Easian02ha4tR32fwwD97Au4YzIIjMCwywCF4D82Sw==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-riscv64@12.21.0': + resolution: {integrity: sha512-EYv3GzxeBTITCuM3yGHHbpRFpUvyulkXpQ6LsjKAQNL3iaba1E6h9iDmlouLb3Io4AMMsfdk0/uG6poQ41uewA==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-s390x@12.21.0': + resolution: {integrity: sha512-8VXGNGVNEfs7pL9GTZOzFxjFEnMt4WL3rLOADR5/kPQ7ROTV9GfpVI2DPO/zArXFSkvfc9Zad/WypHLbvzoaTQ==} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-x64-musl@12.21.0': + resolution: {integrity: sha512-MnC5vpIXYubhDZCgCwlfJMg7Cg6HupN2IuouT9gD/tUmOfVdQYqeyYccWbthyo/Jeto8de1oQlxeRN1+1Hl2DQ==} cpu: [x64] os: [linux] libc: [musl] - '@pnpm/exe.linux-x64@12.3.4': - resolution: {integrity: sha512-2ZqOlSPkfwX1h5cR+FPiWf8+F+2hZT/3TvhUK5sigHqwaQCIiq8R7CGxhndKs63JtcLi2a1Qpo+wX/EoyfjyJQ==} + '@pnpm/exe.linux-x64@12.21.0': + resolution: {integrity: sha512-8eufCjHXspKbNS/kh8q4Q0gqJoOuvC4Q5pgos6XS8By/nAMtP+jf8F1Cw9er840kfAX+PJ/ts+A9qnLE91rvXQ==} cpu: [x64] os: [linux] libc: [glibc] - '@pnpm/exe.win32-arm64@12.3.4': - resolution: {integrity: sha512-ANyrHqyqco6SXBysUTRF74itDyyraea7IbFsKFdNXTjcFnfycTDx37EwuhdpPYFNSIh2JhUG4fByclsRfiHX7w==} + '@pnpm/exe.netbsd-x64@12.21.0': + resolution: {integrity: sha512-eyh1M8hQZCkLWxuva7S/fc1SbFbgqg0/5di0dgWmyiuc2Io3dbWVihDun8X+XM8zsR5uhIDvvZpbS9aZQbCovg==} + cpu: [x64] + os: [netbsd] + + '@pnpm/exe.win32-arm64@12.21.0': + resolution: {integrity: sha512-7xTxxUXo/grRLivSeIl6B21gnsz7ooe5EMPcJmQqwxc8WLJVReN8MzrlHru8bqXfVr4X3+6ZGZscntKenlCBqQ==} cpu: [arm64] os: [win32] - '@pnpm/exe.win32-x64@12.3.4': - resolution: {integrity: sha512-WH/KqBPY/hq2Tb7SgQltEZytimcjgKRaCRL/aM9CI0c67iKc5TVmHUhIiL3Ux9FB4bWn36i6XewUcScQI+zG8w==} + '@pnpm/exe.win32-x64@12.21.0': + resolution: {integrity: sha512-9TpkJemVApxJ1Z1w0ZFGN+AuSx4nJOqXSJUqMqDvaXTYwGOzvBiiWdFP9GN0ketiWCQS1Q0/pza2E7I3pP0OBQ==} cpu: [x64] os: [win32] - pnpm@12.3.4: - resolution: {integrity: sha512-lhqkH7B32joEpEHZ+OFevAyW2o73ELLrZ7+e58sGEOq9SPH9hfUc/+c4RnhfoPh8VqOocqHYk/hEZ0G1zORUVw==} - engines: {node: '>=18.*'} + pnpm@12.21.0: + resolution: {integrity: sha512-Zv2CeO4ok1zpUXktNDZ/869cQyonVkRYIwKVM4NbjaUpu+C+UTCv1W7QcT+4eJ5Hutgtk71a4v5UsVVi1idu8A==} + engines: {node: '>=18'} hasBin: true snapshots: - '@pnpm/exe.darwin-arm64@12.3.4': + '@pnpm/exe.android-arm64@12.21.0': optional: true - '@pnpm/exe.darwin-x64@12.3.4': + '@pnpm/exe.android-x64@12.21.0': optional: true - '@pnpm/exe.linux-arm64-musl@12.3.4': + '@pnpm/exe.darwin-arm64@12.21.0': optional: true - '@pnpm/exe.linux-arm64@12.3.4': + '@pnpm/exe.darwin-x64@12.21.0': optional: true - '@pnpm/exe.linux-x64-musl@12.3.4': + '@pnpm/exe.freebsd-x64@12.21.0': optional: true - '@pnpm/exe.linux-x64@12.3.4': + '@pnpm/exe.linux-arm64-musl@12.21.0': optional: true - '@pnpm/exe.win32-arm64@12.3.4': + '@pnpm/exe.linux-arm64@12.21.0': optional: true - '@pnpm/exe.win32-x64@12.3.4': + '@pnpm/exe.linux-ppc64@12.21.0': optional: true - pnpm@12.3.4: + '@pnpm/exe.linux-riscv64@12.21.0': + optional: true + + '@pnpm/exe.linux-s390x@12.21.0': + optional: true + + '@pnpm/exe.linux-x64-musl@12.21.0': + optional: true + + '@pnpm/exe.linux-x64@12.21.0': + optional: true + + '@pnpm/exe.netbsd-x64@12.21.0': + optional: true + + '@pnpm/exe.win32-arm64@12.21.0': + optional: true + + '@pnpm/exe.win32-x64@12.21.0': + optional: true + + pnpm@12.21.0: optionalDependencies: - '@pnpm/exe.darwin-arm64': 12.3.4 - '@pnpm/exe.darwin-x64': 12.3.4 - '@pnpm/exe.linux-arm64': 12.3.4 - '@pnpm/exe.linux-arm64-musl': 12.3.4 - '@pnpm/exe.linux-x64': 12.3.4 - '@pnpm/exe.linux-x64-musl': 12.3.4 - '@pnpm/exe.win32-arm64': 12.3.4 - '@pnpm/exe.win32-x64': 12.3.4 + '@pnpm/exe.android-arm64': 12.21.0 + '@pnpm/exe.android-x64': 12.21.0 + '@pnpm/exe.darwin-arm64': 12.21.0 + '@pnpm/exe.darwin-x64': 12.21.0 + '@pnpm/exe.freebsd-x64': 12.21.0 + '@pnpm/exe.linux-arm64': 12.21.0 + '@pnpm/exe.linux-arm64-musl': 12.21.0 + '@pnpm/exe.linux-ppc64': 12.21.0 + '@pnpm/exe.linux-riscv64': 12.21.0 + '@pnpm/exe.linux-s390x': 12.21.0 + '@pnpm/exe.linux-x64': 12.21.0 + '@pnpm/exe.linux-x64-musl': 12.21.0 + '@pnpm/exe.netbsd-x64': 12.21.0 + '@pnpm/exe.win32-arm64': 12.21.0 + '@pnpm/exe.win32-x64': 12.21.0 --- lockfileVersion: '9.0'