Skip to content

chore(swift-sdk): reduce swift-sdk test time in CI #3869

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

Open
ZocoLini wants to merge 1 commit into
base: v3.1-dev
Choose a base branch
from
Open

chore(swift-sdk): reduce swift-sdk test time in CI #3869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
496 changes: 193 additions & 303 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ opt-level = 3
[profile.dev-ios]
inherits = "dev"
panic = "abort"
lto = "thin"
debug = "line-tables-only"

# Optimize heavy crypto crates even in dev/test builds so that
# Halo 2 proof generation and verification run at near-release speed.
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-dpp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ strum = { version = "0.26", features = ["derive"] }
json-schema-compatibility-validator = { path = '../rs-json-schema-compatibility-validator', optional = true }
once_cell = "1.19.0"
tracing = { version = "0.1.41" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa", optional = true }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8", optional = true }

[dev-dependencies]
tokio = { version = "1.40", features = ["full"] }
Expand Down
8 changes: 4 additions & 4 deletions packages/rs-drive-abci/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ derive_more = { version = "1.0", features = ["from", "deref", "deref_mut"] }
async-trait = "0.1.77"
console-subscriber = { version = "0.4", optional = true }
bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "0842b17583888e8f46c252a4ee84cdfd58e0546f", optional = true }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8" }
nonempty = "0.11"
# Shielded-pool snapshot needs raw RocksDB SstFileWriter + ingest_external_file_cf
# bindings, and blake3 for the snapshot-file checksum.
Expand All @@ -107,7 +107,7 @@ dpp = { path = "../rs-dpp", default-features = false, features = [
drive = { path = "../rs-drive", features = ["fixtures-and-mocks"] }
drive-proof-verifier = { path = "../rs-drive-proof-verifier" }
strategy-tests = { path = "../strategy-tests" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa", features = ["client"] }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8", features = ["client"] }
assert_matches = "1.5.0"
drive-abci = { path = ".", features = ["testing-config", "mocks", "shielded_test_data"] }
bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "0842b17583888e8f46c252a4ee84cdfd58e0546f" }
Expand All @@ -121,8 +121,8 @@ integer-encoding = { version = "4.0.0" }

# For dump_only_default_and_aux_cfs_under_shielded_subtree_prefix — same
# subtree-prefix algorithm grovedb uses internally.
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa" }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8" }

[features]
default = ["bls-signatures"]
Expand Down
12 changes: 6 additions & 6 deletions packages/rs-drive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ enum-map = { version = "2.0.3", optional = true }
intmap = { version = "3.0.1", features = ["serde"], optional = true }
chrono = { version = "0.4.35", optional = true }
itertools = { version = "0.13", optional = true }
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa" }
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8" }

[dev-dependencies]
criterion = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-platform-version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license = "MIT"
thiserror = { version = "2.0.12" }
bincode = { version = "=2.0.1" }
versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8" }

[features]
mock-versions = []
1 change: 0 additions & 1 deletion packages/rs-platform-wallet-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ bs58 = "0.5"
zeroize = { version = "1", features = ["derive"] }

[dev-dependencies]
tempfile = "3.8"
dpp = { path = "../rs-dpp", features = ["fixtures-and-mocks"] }

[build-dependencies]
Expand Down
1 change: 0 additions & 1 deletion packages/rs-platform-wallet-storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ windows-native-keyring-store = { version = "=1.0.0", optional = true }
[dev-dependencies]
proptest = "1"
assert_cmd = "2"
predicates = "3"
static_assertions = "1"
filetime = "0.2"
tracing-test = { version = "0.2", features = ["no-env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-platform-wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ image = { version = "0.25", default-features = false, features = ["png", "jpeg",
zeroize = "1"

# Shielded pool (optional, behind `shielded` feature)
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa", optional = true }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8", optional = true }
# Direct `rusqlite` access so `FileBackedShieldedStore::open_path` can set
# WAL + synchronous=NORMAL pragmas before handing the connection to
# `ClientPersistentCommitmentTree`. Version locked to match the rev grovedb
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ drive = { path = "../rs-drive", default-features = false, features = [
] }

drive-proof-verifier = { path = "../rs-drive-proof-verifier", default-features = false }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fc814983d4d36c6ea049642556b9a31ab8d4dfaa", features = [
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b98a35644cdea73cc1b21d7c122cb58ae9fafd8", features = [
"client",
"sqlite",
], optional = true }
Expand Down
1 change: 1 addition & 0 deletions packages/swift-sdk/build_ios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ while [[ $# -gt 0 ]]; do
sim) BUILD_SIM=true ;;
mac) BUILD_MAC=true ;;
all) BUILD_IOS=true; BUILD_SIM=true; BUILD_MAC=true ;;
tests) BUILD_SIM=true; BUILD_MAC=true ;;
Comment thread
ZocoLini marked this conversation as resolved.
*) log_error "Unknown target $2"; show_help ;;
esac
shift 2
Expand Down
8 changes: 1 addition & 7 deletions packages/swift-sdk/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash
set -euo pipefail

# This script builds the sdk using `build_ios.sh` for all targets,
# then runs the DashSDKFFI tests, and finally runs the
# ExampleApp tests on a selected iOS Simulator

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$SCRIPT_DIR" || exit 1

Expand All @@ -20,10 +16,8 @@ if [ -z "$SIM_NAME" ]; then
exit 1
fi

bash build_ios.sh --target all --profile dev
bash build_ios.sh --target tests --profile dev
Comment thread
ZocoLini marked this conversation as resolved.

swift package clean
swift build
swift test
Comment thread
ZocoLini marked this conversation as resolved.

xcodebuild test \
Expand Down
Loading