Fixes indentation and panic on unsupported OS while using bundled bin…

…dings.
avast · Jan 4, 2024 · e1ac71c · e1ac71c
1 parent 90174f2
commit e1ac71c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
         pip install maturin pytest
         maturin develop
         pytest tests
-build-macos:
+  build-macos:
     runs-on: macos-latest
     steps:
     - name: Checkout sources
@@ -63,4 +63,4 @@ build-macos:
     - name: Run Rust tests with bundled bindings
       run: cargo clean && YARI_USE_BUNDLED_BINDINGS=1 CFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib $LDFLAGS" LIBRARY_PATH="$(brew --prefix)/lib:$LIBRARY_PATH" cargo test --verbose
     - name: Run Python tests
-      run: cd yari-py && .venv/bin/maturin develop && .venv/bin/pytest
+      run: cd yari-py && .venv/bin/maturin develop && .venv/bin/pytest
diff --git a/yari-sys/build.rs b/yari-sys/build.rs
@@ -120,11 +120,13 @@ fn main() {
     let out_path = PathBuf::from(out_dir).join("bindings.rs");
     if use_bundled_bindings.is_some() {
         // Different bindings for linux and macos
-        #[cfg(target_os = "linux")]
-        let binding_file = "bindings-linux.rs";
-        #[cfg(target_os = "macos")]
-        let binding_file = "bindings-macos.rs";
-
+        let binding_file = if cfg!(target_os = "linux") {
+            "bindings-linux.rs"
+        } else if cfg!(target_os = "macos") {
+            "bindings-macos.rs"
+        } else {
+            panic!("Unsupported OS for bundled bindings.")
+        };
         fs::copy(PathBuf::from("bindings").join(binding_file), out_path)
             .expect("Could not copy bindings to output directory");
     } else if let Some(bindings_file) = option_env!("YARI_BINDINGS_FILE") {