Skip to content

[pull] dev from tauri-apps:dev - #402

Merged
pull[bot] merged 3 commits into
code:devfrom
tauri-apps:dev
Aug 5, 2026
Merged

[pull] dev from tauri-apps:dev#402
pull[bot] merged 3 commits into
code:devfrom
tauri-apps:dev

Conversation

@pull

@pull pull Bot commented Aug 5, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

renovate Bot and others added 3 commits August 5, 2026 14:30
* chore(deps): update rust crate glob to v0.3.4

* update snapshots

* fix mac and linux

* take 3

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Tony <legendmastertony@gmail.com>
…tic (#15777)

* fix: make embedded assets codegen and config serialization deterministic

generate_context! emitted the embedded asset map and the CSP script/style
hashes in filesystem walk order (varies across machines) and HashMap
iteration order (varies per process), and serializing the processed config
wrote the csp/headers/plugins maps in HashMap iteration order. Both broke
reproducible builds: the same source built on two machines produced
different binaries and a different tauri.conf.json in the generated
Android project. Iterate all of them sorted, complementing #14986 which
sorted the same config maps on the ToTokens path.

closes #14978

* Use `BTreeMap` for embedded assets and inline script hashes

* remove outdated comment

* Convert to BTreeMap instead of sort to vec

---------

Co-authored-by: Tony <68118705+Legend-Master@users.noreply.github.com>
Co-authored-by: Tony <legendmastertony@gmail.com>
…5821)

* fix(runtime-wry): return the expected exit code from run_return()

Transfer the exit code from the window.app_handle().exit(1) call
to the run_return() result instead of always returning 0.
@pull pull Bot locked and limited conversation to collaborators Aug 5, 2026
@pull pull Bot added the ⤵️ pull label Aug 5, 2026
@pull
pull Bot merged commit 0aeadb6 into code:dev Aug 5, 2026
2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants