tawasuyu

tawasuyu/taffy

A high performance rust-powered UI layout library

HTML 5544Rust 88Markdown 11TOML 91926 Definitions

Upgrade cosmic-text to 0.13 (#815)

Signed-off-by: Nico Burns <nico@nicoburns.com>

9124d0260be73aa23948a0858f9c268e8a18d81e · by Nico Burns · (1 year ago) · parent f8a32fcfd · browse the tree at this commit

Semantic delta

No definition changed: this change is text, documentation or data.

4 files · +17 −3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46148c410..7fd7721f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,16 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo build --examples
-      - run: cargo build -p cosmic-text-example
+
+  # cosmic_text example is excluded from the workspace as it breaks compilation of all crates
+  # in the workspace with our MSRV compiler
+  build-cosmic-text-example:
+    name: "Build cosmic-text example"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cd examples/cosmic_text && cargo build
 
   # No features
   test-features-none:
diff --git a/.gitignore b/.gitignore
index 8c2b6605e..d625633e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /target
 /scripts/gentest/target
+/examples/cosmic_text/target
 /yoga_test_fixtures
 /yoga_test_fixtures_grouped
 /test_fixtures/_scratch
diff --git a/Cargo.toml b/Cargo.toml
index 1a09ec92a..e4db4c8e4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,5 +107,9 @@ members = [
     "scripts/gentest",
     "scripts/format-fixtures",
     "scripts/import-yoga-tests",
-    "benches", "examples/cosmic_text", "tests/common",
+    "benches",
+    "tests/common",
 ]
+# The cosmic_text example is excluded from the workspace as including it breaks compilation
+# of all crates in the workspace with our MSRV compiler
+exclude = ["examples/cosmic_text"]
diff --git a/examples/cosmic_text/Cargo.toml b/examples/cosmic_text/Cargo.toml
index b0096a940..5d2f198b4 100644
--- a/examples/cosmic_text/Cargo.toml
+++ b/examples/cosmic_text/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2021"
 
 [dependencies]
 taffy = { path = "../.." }
-cosmic-text = "0.12"
+cosmic-text = "0.13"