Pin branches after merge

pubky · Feb 19, 2025 · 25add1f · 25add1f
1 parent 4a9d6b5
commit 25add1f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,10 +11,10 @@ build = "build.rs"
 
 [dependencies]
 bytes = "1.9.0" # Enforce this version as Pubky and Axum conflict v1.7.1 vs v1.9.0
-pkarr = { git = "https://github.com/pubky/pkarr", branch = "main" }
-pubky = { git = "https://github.com/pubky/pubky", branch = "deps/bump-testnet-pkarr-relay" }
-pubky-testnet = { git = "https://github.com/pubky/pubky", branch = "deps/bump-testnet-pkarr-relay" }
-pubky-app-specs = { git = "https://github.com/pubky/pubky-app-specs", branch = "bump/pkarr", features = [
+pkarr = { git = "https://github.com/pubky/pkarr", rev = "4269e68" } # a few commits after v3.3.1
+pubky = { git = "https://github.com/pubky/pubky", branch = "main" }
+pubky-testnet = { git = "https://github.com/pubky/pubky", branch = "main" }
+pubky-app-specs = { git = "https://github.com/pubky/pubky-app-specs", branch = "main", features = [
     "openapi",
 ] }
 tokio = { version = "1.43.0", features = ["full"] }
@@ -43,7 +43,7 @@ reqwest = "0.12.9"
 anyhow = "1.0.95"
 httpc-test = "0.1.10"
 criterion = { version = "0.5.1", features = ["async_tokio"] }
-pubky-homeserver = { git = "https://github.com/pubky/pubky", branch = "deps/bump-testnet-pkarr-relay" }
+pubky-homeserver = { git = "https://github.com/pubky/pubky", branch = "main" }
 rand = "0.8.5"
 rand_distr = "0.4.3"
 tokio-shared-rt = "0.1"