Skip to content

Commit

Permalink
Merge pull request #1456 from messense/generate-ci
Browse files Browse the repository at this point in the history
Add `generate-ci` subcommand to generate CI configuration
  • Loading branch information
messense authored Feb 3, 2023
2 parents 3cef2a0 + b8bbf9c commit 46f4b1a
Show file tree
Hide file tree
Showing 12 changed files with 701 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ cargo-xwin = { version = "0.14.0", default-features = false, optional = true }
tracing = "0.1.36"
tracing-subscriber = { version = "0.3.15", features = ["env-filter"], optional = true }

# project scaffolding, maturin new/init
# project scaffolding, maturin new/init/generate-ci
dialoguer = { version = "0.10.2", default-features = false, optional = true }
console = { version = "0.15.4", optional = true }
minijinja = { version = "0.30.2", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions src/build_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ pub fn find_bridge(cargo_metadata: &Metadata, bridge: Option<&str>) -> Result<Br
};

if !(bridge.is_bindings("pyo3") || bridge.is_bindings("pyo3-ffi")) {
println!("🔗 Found {bridge} bindings");
eprintln!("🔗 Found {bridge} bindings");
}

for &lib in PYO3_BINDING_CRATES.iter() {
Expand All @@ -1034,10 +1034,10 @@ pub fn find_bridge(cargo_metadata: &Metadata, bridge: Option<&str>) -> Result<Br
}

return if let Some((major, minor)) = has_abi3(cargo_metadata)? {
println!("🔗 Found {lib} bindings with abi3 support for Python ≥ {major}.{minor}");
eprintln!("🔗 Found {lib} bindings with abi3 support for Python ≥ {major}.{minor}");
Ok(BridgeModel::BindingsAbi3(major, minor))
} else {
println!("🔗 Found {lib} bindings");
eprintln!("🔗 Found {lib} bindings");
Ok(bridge)
};
}
Expand Down
Loading

0 comments on commit 46f4b1a

Please sign in to comment.