Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Circle CI #68

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Remove Circle CI #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb910aa
Remove Circle CI
jguhlin Aug 8, 2024
92c53ae
Better zlib handling
jguhlin Aug 8, 2024
9acb3e0
Remove mm2-fast tests
jguhlin Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/build-test-rust-minimap2-sys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,5 @@ jobs:
- run: cd minimap2-sys
- name: Run minimap2-sys tests
run: cargo test
- name: Run minimap2-sys mm2-fast tests
run: cargo test --features mm2-fast
- name: Run minimap2-sys simde tests
run: cargo test --features simde
2 changes: 0 additions & 2 deletions .github/workflows/build-test-rust-minimap2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ jobs:
run: cargo test --verbose
- name: Run tests htslib
run: cargo test --features htslib
- name: Run tests mm2-fast
run: cargo test --features mm2-fast
- name: Run tests simde
run: cargo test --features simde

Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ simdutf8 = {version = "0.1", optional = true}
needletail = { version = "0.5", optional = true, default-features = false}

# Dep for development
# minimap2-sys = { path = "./minimap2-sys" }
minimap2-sys = "0.1.19"
minimap2-sys = { path = "./minimap2-sys" }
# minimap2-sys = "0.1.19"
rust-htslib = { version = "0.47", default-features = false, optional = true }

[dev-dependencies]
Expand Down
14 changes: 14 additions & 0 deletions minimap2-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,27 @@ fn compile() {

cc.flag("-DHAVE_KALLOC");
cc.flag("-lm");
cc.flag("-lz");
cc.flag("-lpthread");

#[cfg(feature = "static")]
cc.static_flag(true);

if let Some(include) = std::env::var_os("DEP_Z_INCLUDE") {
println!("-------------FOUND ZLIB INCLUDE: {:?}", include);
cc.include(include);
// Use env DEP_Z_ROOT to find the library
if let Some(lib) = std::env::var_os("DEP_Z_ROOT") {
let lib = lib.to_str().unwrap();
println!("cargo:rustc-link-search=native={}", lib);
println!("cargo:rustc-link-lib=static=z");

}
}

// Debugging, print out the entire environment
for (key, value) in std::env::vars() {
println!("{}: {}", key, value);
}

if let Ok(lib) = pkg_config::find_library("zlib") {
Expand Down
Loading