Skip to content

fix(tauri): don't leak wry into CEF builds + don't gate updater manifest on android#1165

Merged
7w1 merged 5 commits into
SableClient:devfrom
eleboucher:fix/cef-webkit2gtk-gating
Jul 21, 2026
Merged

fix(tauri): don't leak wry into CEF builds + don't gate updater manifest on android#1165
7w1 merged 5 commits into
SableClient:devfrom
eleboucher:fix/cef-webkit2gtk-gating

Conversation

@eleboucher

@eleboucher eleboucher commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Description

fix packaging to not including wry in cef build + don't wait 45 minutes to release the desktop auto update json

Fixes #

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings

AI disclosure:

  • Partially AI assisted (clarify which code was AI assisted and briefly explain what it does).
  • Fully AI generated (explain what all the generated code does in moderate detail).

tauri-plugin-devtools (default-features = wry) and the
tauri-plugin-notifications fork (tauri defaults = wry) both forced
tauri/wry -> tauri-runtime-wry -> webkit2gtk into CEF builds that
should only use the CEF runtime.

- devtools: default-features = false; Sable's wry feature already
  enables tauri/wry for wry builds
- notifications: bump to fork rev 0ca647a which drops tauri defaults
- remove the broken not(feature = "cef") target-cfg gate (cargo
  ignores feature = in cfg predicates) and the redundant direct
  webkit2gtk dep (pulled transitively via tauri-runtime-wry)
The updater-manifest job needed [setup-release, build, android], but
android takes 45 min and dev pushes cancel in-progress runs. So the
manifest almost never ran -- latest.json was stuck at nightly.29.1 for
4 builds.

The manifest only uses desktop .sig files (produced by the build job);
android produces no updater artifacts. Drop it from needs.
@eleboucher
eleboucher requested review from 7w1 and hazre as code owners July 20, 2026 20:46
@7w1 7w1 added the internal label Jul 20, 2026
lib.rs uses webkit2gtk directly for WebKitGTK permission handling.
The transitive dep via tauri-runtime-wry doesn't put it in scope for
'use webkit2gtk::...'. Make it optional and gate via the wry feature
so CEF builds still exclude it.
Record webkit2gtk as a direct (optional) dependency of the sable app
crate in Cargo.lock, matching the Cargo.toml change that made
webkit2gtk optional and gated via the wry feature. cargo --locked was
failing because the lockfile was missing this dependency entry.
@7w1

7w1 commented Jul 20, 2026

Copy link
Copy Markdown
Member

Use the PR template please, also those links are linking to sable issues so no clue what this depends on

@7w1
7w1 enabled auto-merge July 21, 2026 16:25
@7w1
7w1 added this pull request to the merge queue Jul 21, 2026
Merged via the queue into SableClient:dev with commit 6dab80d Jul 21, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants