allow changing of hydroflow git dependency in template for testing

MingweiSamuel · Jul 16, 2024 · 8ba146e · 8ba146e
1 parent e05cad2
commit 8ba146e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/template/hydroflow/Cargo.toml b/template/hydroflow/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+chrono = { version = "0.4.20", features = [ "serde" ], default-features = true }
 clap = { version = "4.0.29", features = [ "derive" ] }
-hydroflow = { git = "https://github.com/hydro-project/hydroflow" }
+hydroflow = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
 serde = { version = "1", features = [ "derive" ] }
-chrono = { version = "0.4.20", features = [ "serde" ], default-features = true }
diff --git a/template/hydroflow/cargo-generate.toml b/template/hydroflow/cargo-generate.toml
@@ -1,4 +1,4 @@
 [template]
 ignore = [
   "Cargo.lock",
-]
+]
diff --git a/template/hydroflow_plus/flow/Cargo.toml b/template/hydroflow_plus/flow/Cargo.toml
@@ -6,18 +6,18 @@ edition = "2021"
 
 [dependencies]
 # make sure to sync these to `flow_macro`!
-hydroflow_plus = { git = "https://github.com/hydro-project/hydroflow.git" }
+hydroflow_plus = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
+hydroflow_plus_cli_integration = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
+stageleft = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
 tokio = { version = "1.16", features = [ "full" ] }
-stageleft = { git = "https://github.com/hydro-project/hydroflow.git" }
-hydroflow_plus_cli_integration = { git = "https://github.com/hydro-project/hydroflow.git" }
 
 # this dependency should NOT be added to `flow_macro`
 flow_macro = { path = "../flow_macro" }
 
 [build-dependencies]
-stageleft_tool = { git = "https://github.com/hydro-project/hydroflow.git" }
+stageleft_tool = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
 
 [dev-dependencies]
-hydro_deploy = { git = "https://github.com/hydro-project/hydroflow.git" }
-hydroflow_plus_cli_integration = { git = "https://github.com/hydro-project/hydroflow.git", features = [ "deploy" ] }
 async-ssh2-lite = { version = "0.4.2", features = [ "vendored-openssl" ] }
+hydro_deploy = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
+hydroflow_plus_cli_integration = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
diff --git a/template/hydroflow_plus/flow_macro/Cargo.toml b/template/hydroflow_plus/flow_macro/Cargo.toml
@@ -13,10 +13,11 @@ default = ["macro"]
 macro = []
 
 [dependencies]
-hydroflow_plus = { git = "https://github.com/hydro-project/hydroflow.git" }
+# make sure to sync these to `flow`!
+hydroflow_plus = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
+hydroflow_plus_cli_integration = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
+stageleft = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }
 tokio = { version = "1.16", features = [ "full" ] }
-stageleft = { git = "https://github.com/hydro-project/hydroflow.git" }
-hydroflow_plus_cli_integration = { git = "https://github.com/hydro-project/hydroflow.git" }
 
 [build-dependencies]
-stageleft_tool = { git = "https://github.com/hydro-project/hydroflow.git" }
+stageleft_tool = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow' }}", branch = "{{ hydroflow_branch | default: 'main' }}" }