Merge BlockstreamResearch#276: Fix Windows

9ae18c6 ci: Run tests on Windows (Christian Lewe)
af457a5 fix: simplicity-sys is skipped in CI (Christian Lewe)
a1e432f fix: FFI types on Windows (Christian Lewe)

Pull request description:

  Fixes BlockstreamResearch#274

ACKs for top commit:
  apoelstra:
    ACK 9ae18c6; successfully ran local tests

Tree-SHA512: 068b2a91f2c8f72b624d4006315b6182d4ea157e721741350e6d00b516a7c27656fea6f84dc1b652f9afd6dd4ca6ed6785793830106c5cf874a665d57959559d

Author: apoelstra

.github/workflows/main.yml

@@ -107,7 +107,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest]
+        os: [macos-latest, windows-latest]
     steps:
       - name: Checkout Crate
         uses: actions/checkout@v4
@@ -116,4 +116,6 @@ jobs:
       - name: Set dependencies
         run: cp Cargo-recent.lock Cargo.lock
       - name: Run unit tests
-        run: cargo test --locked --workspace --all-features
+        run: |
+          cargo test --locked --manifest-path simplicity-sys/Cargo.toml
+          cargo test --locked --workspace --all-features

simplicity-sys/src/ffi.rs

@@ -19,13 +19,18 @@ pub type c_int = i32;
 pub type c_uint = u32;
 pub type c_size_t = usize;
 pub type c_uint_fast8_t = u8;
-#[cfg(any(target_arch = "wasm32", target_arch = "aarch64"))]
+#[cfg(all(
+    any(target_arch = "wasm32", target_arch = "aarch64"),
+    not(target_os = "windows")
+))]
 pub type c_uint_fast16_t = u16;
-#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64")))]
+#[cfg(target_os = "windows")]
+pub type c_uint_fast16_t = u32;
+#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64", target_os = "windows")))]
 pub type c_uint_fast16_t = usize;
-#[cfg(any(target_arch = "wasm32", target_arch = "aarch64"))]
+#[cfg(any(target_arch = "wasm32", target_arch = "aarch64", target_os = "windows"))]
 pub type c_uint_fast32_t = u32;
-#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64")))]
+#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64", target_os = "windows")))]
 pub type c_uint_fast32_t = usize;
 #[cfg(target_arch = "wasm32")]
 pub type c_uint_fast64_t = u64;