ci: bundle freetype

servo · Jun 16, 2024 · 29d5e44 · 29d5e44
1 parent 38fdbc7
commit 29d5e44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,15 +27,15 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Cargo build
-        run: cargo build --workspace
+        run: cargo build --workspace --features freetype-bundled
 
       - name: Cargo test
-        run: cargo test --workspace
+        run: cargo test --workspace --features freetype-bundled
         env:
           RUST_BACKTRACE: 1
 
       - name: Cargo check no-default-features
-        run: cargo check --no-default-features
+        run: cargo check --no-default-features --features freetype-bundled
         env:
           RUST_BACKTRACE: 1
 

diff --git a/harfbuzz-sys/build.rs b/harfbuzz-sys/build.rs
@@ -31,10 +31,10 @@ fn build_harfbuzz() {
         cfg.define("HAVE_DIRECTWRITE", "1");
     }
 
-    // if cfg!(feature = "freetype") {
-    //     cfg.define("HAVE_FREETYPE", "1");
-    //     cfg.include("freetype/include/");
-    // }
+    if cfg!(feature = "freetype") {
+        cfg.define("HAVE_FREETYPE", "1");
+        cfg.include("freetype/include/");
+    }
 
     if target.contains("windows-gnu") {
         cfg.flag("-Wa,-mbig-obj");