CI: Add bindings check before release

Also, add a serate check to make sure that the layout tests are still
run from CI (since we disabled it from the main build step).

Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>

Author: sidcha

.github/workflows/build-ci.yml

@@ -32,6 +32,32 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y gcc-arm-none-eabi
       - name: Cargo check no-std
         run: cargo check --package libosdp --target thumbv6m-none-eabi --no-default-features
+
+  bindings-check:
+    name: Regenerate bindings and check on ${{ matrix.target }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [x86_64-unknown-linux-gnu, thumbv6m-none-eabi]
+    env:
+      LIBOSDP_SYS_REGENERATE_BINDINGS: "1"
+      LIBOSDP_SYS_BINDGEN_LAYOUT_TESTS: "1"
+      CCACHE_DISABLE: "1"
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+      - name: Setup rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        with:
+          toolchain: stable
+          target: ${{ matrix.target }}
+      - name: Install gcc-arm-none-eabi
+        if: matrix.target == 'thumbv6m-none-eabi'
+        run: sudo apt-get update && sudo apt-get install -y gcc-arm-none-eabi
+      - name: Regenerate bindings and cargo check
+        run: cargo check -p libosdp-sys --target ${{ matrix.target }}
   test:
     runs-on: ubuntu-latest
     steps:

.github/workflows/publish-libosdp-sys.yml

@@ -14,8 +14,27 @@ on:
     - 'libosdp-sys-v*'
 
 jobs:
+  bindings_match:
+    name: Verify checked-in bindings
+    runs-on: ubuntu-latest
+    env:
+      CCACHE_DISABLE: "1"
+      LIBOSDP_SYS_REGENERATE_BINDINGS: "1"
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: recursive
+    - uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      with:
+        toolchain: stable
+    - name: Regenerate bindings
+      run: cargo build -p libosdp-sys
+    - name: Check bindings are committed
+      run: git diff --exit-code -- libosdp-sys/src/bindings.rs
+
   cross_platform_check:
     name: Build crate on ${{ matrix.os }}
+    needs: [bindings_match]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -31,7 +50,7 @@ jobs:
 
   publish:
     name: Publish Crate
-    needs: [cross_platform_check]
+    needs: [bindings_match, cross_platform_check]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5

libosdp-sys/build.rs

@@ -192,14 +192,17 @@ fn main() -> Result<()> {
     /* regenerate bindings only when requested by maintainer */
     if std::env::var("LIBOSDP_SYS_REGENERATE_BINDINGS").as_deref() == Ok("1") {
         let mut args = vec![format!("-I{}", &out_dir)];
+        let target = std::env::var("TARGET").unwrap();
+        args.push(format!("--target={target}"));
         if short_enums {
             args.push("-fshort-enums".to_owned());
         } else {
             args.push("-fno-short-enums".to_owned());
         }
+        let layout_tests = std::env::var("LIBOSDP_SYS_BINDGEN_LAYOUT_TESTS").as_deref() == Ok("1");
         let bindings = bindgen::Builder::default()
             .use_core()
-            .layout_tests(false)
+            .layout_tests(layout_tests)
             .header("vendor/include/osdp.h")
             .clang_args(args)
             .generate()