Remove the ffi-headers feature

Rely on a separate cbindgen instance instead, which is less self-contained but more practical.
Ortham · Apr 30, 2024 · 3b6ccef · 3b6ccef
1 parent 1e9cd3e
commit 3b6ccef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 253 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,9 @@ jobs:
       # Need to rebuild the FFI wrapper so that its binary is given a filename
       # without a hash.
       - name: Build FFI wrapper
-        run: cargo build --manifest-path ffi/Cargo.toml --features ffi-headers
+        run: |
+          cargo build --manifest-path ffi/Cargo.toml
+          cbindgen ffi/ -o ffi/include/esplugin.h
 
       # Use bash because PowerShell doesn't fail if one command fails.
       - name: Build and run C++ tests
@@ -86,7 +88,9 @@ jobs:
       # Need to rebuild the FFI wrapper so that its binary is given a filename
       # without a hash.
       - name: Build FFI wrapper
-        run: cargo build --manifest-path ffi/Cargo.toml --features ffi-headers
+        run: |
+          cargo build --manifest-path ffi/Cargo.toml
+          cbindgen ffi/ -o ffi/include/esplugin.h
 
       # Use bash because PowerShell doesn't fail if one command fails.
       - name: Build and run C++ tests