chore: replace submodules with workspace deps

rivet-gg · Nov 20, 2024 · 5ca6e64 · 5ca6e64
1 parent 5cb08ff
commit 5ca6e64
Show file tree

Hide file tree

Showing 155 changed files with 247 additions and 163 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -891,6 +891,40 @@ path = "packages/services/tier"
 [workspace.dependencies.rivet-api]
 path = "sdks/full/rust"
 
+[workspace.dependencies.sqlx]
+git = "https://github.com/rivet-gg/sqlx"
+rev = "e7120f59"
+
+[workspace.dependencies.nomad_client]
+git = "https://github.com/rivet-gg/nomad-client"
+rev = "abb66bf"
+
+[workspace.dependencies.nomad_client_new]
+git = "https://github.com/rivet-gg/nomad-client"
+rev = "abb66bf"
+package = "nomad_client"
+
+[workspace.dependencies.async-posthog]
+git = "https://github.com/rivet-gg/posthog-rs"
+rev = "ef4e80e"
+
+[workspace.dependencies.cloudflare]
+git = "https://github.com/cloudflare/cloudflare-rs"
+rev = "f14720e"
+
+[workspace.dependencies.rivet-term]
+git = "https://github.com/rivet-gg/rivet-term"
+rev = "d539a07"
+
+[workspace.dependencies.redis]
+# TODO: https://github.com/rivet-gg/rivet/issues/508
+git = "https://github.com/rivet-gg/redis-rs"
+rev = "ac3e27f"
+
+[workspace.dependencies.serde_array_query]
+git = "https://github.com/rivet-gg/serde_array_query"
+rev = "b9f8bfa"
+
 [profile.dev]
 overflow-checks = false
 debug = false

diff --git a/packages/api/traefik-provider/Cargo.toml b/packages/api/traefik-provider/Cargo.toml
@@ -43,7 +43,7 @@ rivet-config.workspace = true
 rivet-env.workspace = true
 
 [dependencies.sqlx]
-path = "../../../externals/sqlx"
+workspace = true
 default-features = false
 features = ["json"]
 

diff --git a/packages/common/api-helper/build/Cargo.toml b/packages/common/api-helper/build/Cargo.toml
@@ -51,7 +51,7 @@ url = "2.2.2"
 uuid = { version = "1", features = ["v4"] }
 
 [dependencies.serde_array_query]
-path = "../../../../externals/serde_array_query"
+workspace = true
 
 [dev-dependencies]
 chirp-worker.workspace = true

diff --git a/packages/common/cache/build/Cargo.toml b/packages/common/cache/build/Cargo.toml
@@ -25,8 +25,7 @@ types-proto.workspace = true
 uuid = { version = "1", features = ["v4"] }
 
 [dependencies.redis]
-# TODO: https://github.com/rivet-gg/rivet/issues/508
-path = "../../../../externals/redis-rs/redis"
+workspace = true
 default-features = false
 features = [
 	"keep-alive",

diff --git a/packages/common/chirp-workflow/core/Cargo.toml b/packages/common/chirp-workflow/core/Cargo.toml
@@ -38,7 +38,7 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 uuid = { version = "1.8.0", features = ["v4", "serde"] }
 
 [dependencies.sqlx]
-path = "../../../../externals/sqlx"
+workspace = true
 default-features = false
 features = [
 	"runtime-tokio",

diff --git a/packages/common/chirp/perf/Cargo.toml b/packages/common/chirp/perf/Cargo.toml
@@ -22,7 +22,7 @@ features = ["v4", "serde"]
 
 [dependencies.redis]
 # TODO: https://github.com/rivet-gg/rivet/issues/508
-path = "../../../../externals/redis-rs/redis"
+workspace = true
 default-features = false
 features = [
 	"keep-alive",

diff --git a/packages/common/chirp/worker/Cargo.toml b/packages/common/chirp/worker/Cargo.toml
@@ -50,7 +50,7 @@ features = ["v4", "serde"]
 
 [dependencies.redis]
 # TODO: https://github.com/rivet-gg/rivet/issues/508
-path = "../../../../externals/redis-rs/redis"
+workspace = true
 default-features = false
 features = [
 	"keep-alive",

diff --git a/packages/common/nomad-util/Cargo.toml b/packages/common/nomad-util/Cargo.toml
@@ -21,5 +21,4 @@ tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"
 
 [dependencies.nomad_client_new]
-package = "nomad_client"
-path = "../../../externals/nomad-client"
+workspace = true
diff --git a/packages/common/pools/Cargo.toml b/packages/common/pools/Cargo.toml
@@ -24,7 +24,7 @@ url = "2.4"
 rivet-config.workspace = true
 
 [dependencies.sqlx]
-path = "../../../externals/sqlx"
+workspace = true
 default-features = false
 features = [
 	"runtime-tokio",
@@ -39,7 +39,7 @@ features = [
 
 [dependencies.redis]
 # TODO: https://github.com/rivet-gg/rivet/issues/508
-path = "../../../externals/redis-rs/redis"
+workspace = true
 default-features = false
 features = [
 	"keep-alive",

diff --git a/packages/common/redis-util/Cargo.toml b/packages/common/redis-util/Cargo.toml
@@ -11,6 +11,6 @@ regex = "1.5"
 
 [dependencies.redis]
 # TODO: https://github.com/rivet-gg/rivet/issues/508
-path = "../../../externals/redis-rs/redis"
+workspace = true
 default-features = false
 
diff --git a/packages/common/util/core/Cargo.toml b/packages/common/util/core/Cargo.toml
@@ -39,7 +39,7 @@ types-proto.workspace = true
 uuid = { version = "1", features = ["v4", "serde"] }
 
 [dependencies.sqlx]
-path = "../../../../externals/sqlx"
+workspace = true
 default-features = false
 features = [
 	"runtime-tokio",