diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e4deae72..7c004d0c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,6 +20,7 @@ env: name: CI on: + push: pull_request: merge_group: diff --git a/Cargo.lock b/Cargo.lock index 44a187f8d..b48d1419f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -694,7 +694,7 @@ dependencies = [ [[package]] name = "fontique" version = "0.1.0" -source = "git+https://github.com/linebender/parley?rev=9e2be05f4bd8935758dc0074638c2ec6eaff3806#9e2be05f4bd8935758dc0074638c2ec6eaff3806" +source = "git+https://github.com/linebender/parley?rev=75199b2d5776268fca5395bde10ecb4924892681#75199b2d5776268fca5395bde10ecb4924892681" dependencies = [ "anyhow", "bytemuck", @@ -706,7 +706,7 @@ dependencies = [ "hashbrown", "icu_locid", "icu_properties", - "memmap2", + "memmap2 0.5.10", "peniko", "roxmltree", "skrifa 0.19.0", @@ -1356,6 +1356,15 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.9.4" @@ -1602,7 +1611,7 @@ dependencies = [ [[package]] name = "parley" version = "0.1.0" -source = "git+https://github.com/linebender/parley?rev=9e2be05f4bd8935758dc0074638c2ec6eaff3806#9e2be05f4bd8935758dc0074638c2ec6eaff3806" +source = "git+https://github.com/linebender/parley?rev=75199b2d5776268fca5395bde10ecb4924892681#75199b2d5776268fca5395bde10ecb4924892681" dependencies = [ "fontique", "peniko", @@ -1824,9 +1833,12 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] [[package]] name = "rustc-demangle" @@ -1888,7 +1900,7 @@ checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ "ab_glyph", "log", - "memmap2", + "memmap2 0.9.4", "smithay-client-toolkit", "tiny-skia", ] @@ -2009,7 +2021,7 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2", + "memmap2 0.9.4", "rustix", "thiserror", "wayland-backend", @@ -3048,7 +3060,7 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2", + "memmap2 0.9.4", "ndk", "ndk-sys", "objc2", @@ -3212,6 +3224,12 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + [[package]] name = "yazi" version = "0.1.6" diff --git a/Cargo.toml b/Cargo.toml index 8152a2765..3d1406835 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ xilem_core = { version = "0.1.0", path = "crates/xilem_core" } masonry = { version = "0.1.0", path = "crates/masonry" } kurbo = "0.11.0" winit = { version = "0.29", features = ["rwh_05"] } -parley = { git = "https://github.com/linebender/parley", rev = "9e2be05f4bd8935758dc0074638c2ec6eaff3806" } +parley = { git = "https://github.com/linebender/parley", rev = "75199b2d5776268fca5395bde10ecb4924892681" } vello = { git = "https://github.com/linebender/vello/", rev = "b520a35addfa6bbb37d93491d2b8236528faf3b5" } [workspace.lints]