Allow 'sqlcipher' feature for all uses of rusqlite
This also patches our CI test script to only run "--feature sqlcipher" tests on sub-crates which expose this feature (i.e. themselves rely on rusqlite).
This commit is contained in:
parent
fe1a034822
commit
9e8292e68b
9 changed files with 25 additions and 3 deletions
|
@ -19,10 +19,10 @@ script:
|
||||||
# We can't pick individual features out with `cargo test --all` (At the time of this writing, this
|
# We can't pick individual features out with `cargo test --all` (At the time of this writing, this
|
||||||
# works but does the wrong thing because of a bug in cargo, but its fix will be to disallow doing
|
# works but does the wrong thing because of a bug in cargo, but its fix will be to disallow doing
|
||||||
# this all-together, see https://github.com/rust-lang/cargo/issues/5364 for more information). To
|
# this all-together, see https://github.com/rust-lang/cargo/issues/5364 for more information). To
|
||||||
# work around this, we run individual tests for each subcrate individually.
|
# work around this, we run tests individually for subcrates that rely on `rusqlite`.
|
||||||
- |
|
- |
|
||||||
for manifest in $(find . -type f -name Cargo.toml); do
|
for crate in "" "db" "db-traits" "ffi" "public-traits" "query-projector" "query-projector-traits" "query-pull" "sql" "tolstoy" "tolstoy-traits" "tools/cli"; do
|
||||||
cargo test --manifest-path $manifest --verbose --no-default-features --features sqlcipher
|
cargo test --manifest-path ./$crate/Cargo.toml --verbose --no-default-features --features sqlcipher
|
||||||
done
|
done
|
||||||
after_success:
|
after_success:
|
||||||
- |
|
- |
|
||||||
|
|
|
@ -7,6 +7,9 @@ workspace = ".."
|
||||||
name = "db_traits"
|
name = "db_traits"
|
||||||
path = "lib.rs"
|
path = "lib.rs"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
failure = "0.1.1"
|
failure = "0.1.1"
|
||||||
failure_derive = "0.1.1"
|
failure_derive = "0.1.1"
|
||||||
|
|
|
@ -9,6 +9,7 @@ path = "lib.rs"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["syncable"]
|
default = ["syncable"]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
syncable = ["tolstoy_traits"]
|
syncable = ["tolstoy_traits"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|
|
@ -7,6 +7,9 @@ workspace = ".."
|
||||||
name = "query_projector_traits"
|
name = "query_projector_traits"
|
||||||
path = "lib.rs"
|
path = "lib.rs"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
failure = "0.1.1"
|
failure = "0.1.1"
|
||||||
failure_derive = "0.1.1"
|
failure_derive = "0.1.1"
|
||||||
|
|
|
@ -3,6 +3,9 @@ name = "mentat_query_projector"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
workspace = ".."
|
workspace = ".."
|
||||||
|
|
||||||
|
[features]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
failure = "0.1.1"
|
failure = "0.1.1"
|
||||||
indexmap = "1"
|
indexmap = "1"
|
||||||
|
|
|
@ -3,6 +3,9 @@ name = "mentat_query_pull"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
workspace = ".."
|
workspace = ".."
|
||||||
|
|
||||||
|
[features]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
failure = "0.1.1"
|
failure = "0.1.1"
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,9 @@ name = "mentat_sql"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
workspace = ".."
|
workspace = ".."
|
||||||
|
|
||||||
|
[features]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
failure = "0.1.1"
|
failure = "0.1.1"
|
||||||
ordered-float = "0.5"
|
ordered-float = "0.5"
|
||||||
|
|
|
@ -7,6 +7,9 @@ workspace = ".."
|
||||||
name = "tolstoy_traits"
|
name = "tolstoy_traits"
|
||||||
path = "lib.rs"
|
path = "lib.rs"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
failure = "0.1.1"
|
failure = "0.1.1"
|
||||||
failure_derive = "0.1.1"
|
failure_derive = "0.1.1"
|
||||||
|
|
|
@ -4,6 +4,9 @@ version = "0.0.1"
|
||||||
workspace = ".."
|
workspace = ".."
|
||||||
authors = ["Grisha Kruglov <gkruglov@mozilla.com>"]
|
authors = ["Grisha Kruglov <gkruglov@mozilla.com>"]
|
||||||
|
|
||||||
|
[features]
|
||||||
|
sqlcipher = ["rusqlite/sqlcipher"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
failure = "0.1.1"
|
failure = "0.1.1"
|
||||||
futures = "0.1"
|
futures = "0.1"
|
||||||
|
|
Loading…
Reference in a new issue