Regenerate header bindings for the current target instead of reusing incompatible x64 Windows bindings

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
+name: CI
+
 on:
   push:
-  pull_request:
 
 jobs:
   rust:
@@ -14,8 +15,6 @@ jobs:
         run: cargo fmt --all -- --check
       - name: Cargo clippy
         run: cargo clippy --workspace --all-targets -- -D warnings
-      - name: Cargo test
-        run: cargo test --workspace
 
   rust-msrv:
     name: Build-test MSRV (1.74) with minimal crate dependencies
@@ -33,3 +32,84 @@ jobs:
       - uses: dtolnay/rust-toolchain@1.74.0
       - name: Cargo check
         run: cargo check --workspace --all-targets
+
+  cross:
+    name: ${{ matrix.name }} (${{ matrix.target }})
+    runs-on: ${{ matrix.os }}
+    env:
+      PROGRAM: ${{ matrix.cross && 'cross' || 'cargo' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-unknown-linux-gnu
+            os: ubuntu-latest
+            name: Linux
+            cross: false
+            test: true
+
+          - target: x86_64-apple-darwin
+            os: macos-latest
+            name: macOS
+            cross: false
+            test: true
+
+          - os: windows-latest
+            name: Windows
+            target: x86_64-pc-windows-msvc
+            cross: false
+            test: true
+
+          # - os: ubuntu-latest
+          #   name: FreeBSD
+          #   target: x86_64-unknown-freebsd
+          #   cross: true
+          #   test: false
+
+          - target: aarch64-linux-android
+            os: ubuntu-latest
+            name: Android
+            cross: true
+            test: true
+
+          # - os: ubuntu-latest
+          #   name: OpenWrt
+          #   target: aarch64-unknown-linux-gnu
+          #   cross: true
+          #   test: true
+          #   cargo_args: --features "openwrt"
+
+          - target: armv7-unknown-linux-gnueabihf
+            os: ubuntu-latest
+            name: Linux ARMv7
+            cross: true
+            test: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Bootstrap
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+
+      - name: Install cross
+        run: cargo install cross
+        if: ${{ matrix.cross }}
+
+      - name: Build
+        run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} ${{ matrix.cargo_args }}
+
+      - name: Test
+        run: ${{ env.PROGRAM }} test --target=${{ matrix.target }} ${{ matrix.cargo_args }}
+        if: ${{ matrix.test }}
+
+      - name: Run example
+        run: cargo run --example info
+      - uses: actions/upload-artifact@v4
+        with:
+          name: info-${{ matrix.target }}
+          path: info.txt

.gitignore

@@ -1,3 +1,3 @@
 /target
 /Cargo.lock
-info.txt
+info.txt

Cargo.toml

@@ -11,9 +11,6 @@ include = ["src", "vendor", "examples", "LICENSE", "build.rs"]
 categories = ["hardware-support"] # https://crates.io/category_slugs
 keywords = []
 
-[features]
-generate_bindings = ["dep:bindgen"]
-
 [dependencies]
 bytemuck = "1"
 serde = { version = "1", features = ["derive", "rc"] }
@@ -22,5 +19,5 @@ serde = { version = "1", features = ["derive", "rc"] }
 serde_json = "1"
 
 [build-dependencies]
-bindgen = { version = "0.69", optional = true }
+bindgen = { version = "0.69" }
 cc = "1.1.0"

build.rs

@@ -134,25 +134,21 @@ fn main() {
 
     build.compile("cpuinfo");
 
-    #[cfg(feature = "generate_bindings")]
-    generate_bindings("src/bindings.rs")
+    generate_bindings();
 }
 
-#[cfg(feature = "generate_bindings")]
-fn generate_bindings(output_file: &str) {
+fn generate_bindings() {
+    let dest = std::env::var("OUT_DIR").unwrap();
+    let dest = std::path::Path::new(&dest).join("bindings.rs");
+
     let bindings = bindgen::Builder::default()
         .header("vendor/cpuinfo/include/cpuinfo.h")
-        .raw_line("#![allow(non_upper_case_globals, non_snake_case, non_camel_case_types)]")
-        .raw_line("#![allow(dead_code)]")
         .clang_args(&["-xc++", "-std=c++11"])
         .layout_tests(false)
         .generate()
         .expect("Unable to generate bindings!");
 
     bindings
-        .write_to_file(std::path::Path::new(output_file))
+        .write_to_file(dest)
         .expect("Unable to write bindings!");
 }
-
-#[cfg(not(feature = "generate_bindings"))]
-fn generate_bindings(_: &str) {}