Skip to content

Commit

Permalink
Merge branch '1.x' into feat/azuresigntool
Browse files Browse the repository at this point in the history
  • Loading branch information
tr3ysmith authored Feb 14, 2024
2 parents d7ef631 + 7b5e871 commit 44e5164
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 104 deletions.
5 changes: 5 additions & 0 deletions .changes/runtime-wry-fix-macos-crash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-runtime-wry": patch:bug
---

Fixes a crash on macOS when accessing the windows map.
5 changes: 5 additions & 0 deletions .changes/runtime-wry-wayland.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
tauri-runtime-wry: patch:bug
---

Add missing `arboard` feature flag to prevent panics in wayland session.
9 changes: 5 additions & 4 deletions .github/workflows/covector-version-or-publish-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,15 @@ jobs:
cargo update -p zbus --precise 3.13.0
cargo update -p zbus_names --precise 2.5.0
cargo update -p colored --precise 2.0.2
cargo update -p arboard --precise 3.2.1
cargo update -p tempfile --precise 3.6.0
cargo update -p serde_with:3.4.0 --precise 3.0.0
cargo update -p serde_with:3.6.1 --precise 3.0.0
cargo update -p tokio --precise 1.29.0
cargo update -p flate2 --precise 1.0.26
cargo update -p h2 --precise 0.3.20
cargo update -p reqwest --precise 0.11.18
cargo update -p bstr --precise 1.6.2
cargo update -p cfg-expr:0.15.6 --precise 0.15.4
cargo update -p cfg-expr:0.15.7 --precise 0.15.4
cargo update -p memchr --precise 2.6.2
cargo update -p async-executor --precise 1.5.1
cargo update -p proptest --precise 1.2.0
Expand All @@ -96,11 +97,11 @@ jobs:
cargo update -p is-terminal --precise 0.4.7
cargo update -p tar --precise 0.4.39
cargo update -p serde_json --precise 1.0.97
cargo update -p arboard --precise 3.2.1
cargo update -p petgraph --precise 0.6.3
cargo update -p os_str_bytes --precise 6.5.1

- name: test build
run: cargo check --target ${{ matrix.platform.target }} --features tracing,compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,test,
run: cargo check --target ${{ matrix.platform.target }} --features tracing,compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,test

run-integration-tests:
runs-on: ${{ matrix.platform }}
Expand Down
Loading

0 comments on commit 44e5164

Please sign in to comment.