noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove private feature, restore cfg/docker (#4442)

Browse source
This commit is contained in:
Emmanuel Keller 2024-07-30 18:52:03 +01:00 committed by GitHub
parent 24e9534155
commit 8f7392983f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cargo.toml
View file

@ -23,8 +23,6 @@ performance-profiler = ["dep:pprof"]
# Special features # Special features
storage-fdb-7_1 = ["surrealdb/kv-fdb-7_1"] storage-fdb-7_1 = ["surrealdb/kv-fdb-7_1"]
storage-fdb-7_3 = ["surrealdb/kv-fdb-7_3"] storage-fdb-7_3 = ["surrealdb/kv-fdb-7_3"]
# Trigger database upgrade tests
database-upgrade-tests = []
[workspace] [workspace]
members = [ members = [
@ -184,3 +182,6 @@ assets = [
] ]
extended-description = "A scalable, distributed, collaborative, document-graph database, for the realtime web." extended-description = "A scalable, distributed, collaborative, document-graph database, for the realtime web."
license-file = ["LICENSE", "4"] license-file = ["LICENSE", "4"]
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(docker)'] }

4
Makefile.ci.toml
View file

@ -110,8 +110,8 @@ run_task = { name = ["start-surrealdb", "test-api-integration", "stop-surrealdb"
[tasks.test-database-upgrade] [tasks.test-database-upgrade]
private = true private = true
command = "cargo" command = "cargo"
env = { RUST_BACKTRACE = 1, RUST_LOG = "info" } env = { RUST_BACKTRACE = 1, RUST_LOG = "info", RUSTFLAGS = "--cfg docker" }
args = ["test", "--locked", "--no-default-features", "--features", "database-upgrade-tests,${_TEST_FEATURES}", "--workspace", "--test", "database_upgrade", "--", "database_upgrade", "--show-output"] args = ["test", "--locked", "--no-default-features", "--features", "${_TEST_FEATURES}", "--workspace", "--test", "database_upgrade", "--", "database_upgrade", "--show-output"]
# #

2
tests/database_upgrade.rs
View file

@ -3,7 +3,7 @@
mod common; mod common;
#[cfg(feature = "database-upgrade-tests")] #[cfg(docker)]
mod database_upgrade { mod database_upgrade {
use super::common::docker::DockerContainer; use super::common::docker::DockerContainer;
use super::common::expected::Expected; use super::common::expected::Expected;