ci: install and bundle freetype respectively

servo · Jun 16, 2024 · 8adf12c · 8adf12c
1 parent 1b53025
commit 8adf12c
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
       - name: install harfbuzz from apt
         run: |
           sudo apt update
-          sudo apt install libharfbuzz-dev libfreetype-dev
+          sudo apt install libharfbuzz-dev libfreetype6-dev
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -54,16 +54,16 @@ jobs:
       # do this where the embedded harfbuzz is statically linked, but we don't
       # need to do it for every environment.
       - name: Cargo package
-        run: cargo package --manifest-path=harfbuzz-sys/Cargo.toml --features bundled
+        run: cargo package --manifest-path=harfbuzz-sys/Cargo.toml --features "bundled freetype-bundled"
 
       - name: Cargo build
-        run: cargo build --workspace --features bundled
+        run: cargo build --workspace --features "bundled freetype-bundled"
 
       - name: Cargo clippy
-        run: cargo clippy --workspace --features bundled -- -D warnings
+        run: cargo clippy --workspace --features "bundled freetype-bundled" -- -D warnings
 
       - name: Cargo test
-        run: cargo test --workspace --features bundled
+        run: cargo test --workspace --features "bundled freetype-bundled"
         env:
           RUST_BACKTRACE: 1
 
@@ -114,10 +114,10 @@ jobs:
         run: cargo fmt --all -- --check
 
       - name: Cargo build
-        run: cargo build --workspace --features bundled
+        run: cargo build --workspace --features "bundled freetype-bundled"
 
       - name: Cargo test
-        run: cargo test --workspace --features bundled
+        run: cargo test --workspace --features "bundled freetype-bundled"
         env:
           RUST_BACKTRACE: 1
 
@@ -134,10 +134,10 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Cargo build
-        run: cargo build --workspace --features bundled
+        run: cargo build --workspace --features "bundled freetype-bundled"
 
       - name: Cargo test
-        run: cargo test --workspace --features bundled
+        run: cargo test --workspace --features "bundled freetype-bundled"
         env:
           RUST_BACKTRACE: 1
 
@@ -160,7 +160,7 @@ jobs:
           target: wasm32-unknown-emscripten
 
       - name: Cargo build
-        run: cargo build --target wasm32-unknown-emscripten --workspace --no-default-features --features bundled
+        run: cargo build --target wasm32-unknown-emscripten --workspace --no-default-features --features "bundled freetype-bundled"
 
   ios-ci-static:
     name: stable, iOS, static library
@@ -198,4 +198,3 @@ jobs:
       - name: Mark the job as unsuccessful
         run: exit 1
         if: "!success()"
-