From 9decc3854562856cfcbe4a499895dbfabf94600d Mon Sep 17 00:00:00 2001 From: tbro Date: Tue, 8 Oct 2024 13:49:45 -0600 Subject: [PATCH 1/3] improve dev build times for everyone --- Cargo.toml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 5fb6bbf4bf..5bacb0d87e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -144,3 +144,24 @@ paste = "1.0" rand = "0.8.5" time = "0.3" trait-set = "0.3.0" + +[patch."https://github.com/EspressoSystems/HotShot.git"] +hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } +libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.75-patch1" } +hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } + +[profile.dev] +opt-level = 1 +# Skip compiling the debug information in the first place. +debug = 0 +# Skip linking debug information. +strip = "debuginfo" +[profile.dev.package."*"] +opt-level = 3 From cf1c53f64601780fb7d56ad17e2e4d4eb8a93bb6 Mon Sep 17 00:00:00 2001 From: tbro Date: Tue, 8 Oct 2024 16:14:01 -0600 Subject: [PATCH 2/3] no opts --- Cargo.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5bacb0d87e..04c5c32274 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,9 +158,10 @@ libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", t hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } [profile.dev] -opt-level = 1 -# Skip compiling the debug information in the first place. -debug = 0 +# No optimizations +opt-level = 0 +# Skip compiling the debug information. +debug = false # Skip linking debug information. strip = "debuginfo" [profile.dev.package."*"] From 9bc30e77ad7a4b8ac1b7d820c63dffd569c36def Mon Sep 17 00:00:00 2001 From: tbro Date: Wed, 9 Oct 2024 13:08:56 -0600 Subject: [PATCH 3/3] fix conflict resolution error --- Cargo.toml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 04c5c32274..2f1c9e9569 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -144,19 +144,6 @@ paste = "1.0" rand = "0.8.5" time = "0.3" trait-set = "0.3.0" - -[patch."https://github.com/EspressoSystems/HotShot.git"] -hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } -libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.75-patch1" } -hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.75-patch1" } - [profile.dev] # No optimizations opt-level = 0