aboutsummaryrefslogtreecommitdiff
path: root/mingling_ci/src/bin/ci.rs
diff options
context:
space:
mode:
Diffstat (limited to 'mingling_ci/src/bin/ci.rs')
-rw-r--r--mingling_ci/src/bin/ci.rs27
1 files changed, 4 insertions, 23 deletions
diff --git a/mingling_ci/src/bin/ci.rs b/mingling_ci/src/bin/ci.rs
index e823000..98e0fd5 100644
--- a/mingling_ci/src/bin/ci.rs
+++ b/mingling_ci/src/bin/ci.rs
@@ -1,34 +1,15 @@
-use just_progress::{
- progress::{self},
- renderer::ProgressSimpleRenderer,
+use mingling::setup::{
+ ConfirmSetup, DirectoryEnvironmentSetup, ExitCodeSetup,
+ picker::{ConfirmFlagSetup, HelpFlagSetup, QuietFlagSetup},
};
-use mingling::{
- hook::ProgramHook,
- setup::{
- ConfirmSetup, DirectoryEnvironmentSetup, ExitCodeSetup,
- picker::{ConfirmFlagSetup, HelpFlagSetup, QuietFlagSetup},
- },
-};
-use tokio::join;
use mingling_ci_system::ThisProgram;
use mingling_ci_system::res::*;
#[tokio::main]
async fn main() {
- let center = progress::init();
- let renderer = ProgressSimpleRenderer::new().with_subprogress(true);
- let bind = progress::bind(center, move |name, state| renderer.update(name, state));
-
- let (_, exit_code) = join!(bind, mingling_ci_begin());
- std::process::exit(exit_code);
-}
-
-async fn mingling_ci_begin() -> i32 {
let mut program = ThisProgram::new();
- program.with_hook(ProgramHook::empty().on_finish(|_| progress::close()));
-
// Plugins
program.with_setup(ExitCodeSetup::default());
program.with_setup(DirectoryEnvironmentSetup::default());
@@ -44,5 +25,5 @@ async fn mingling_ci_begin() -> i32 {
program.with_setup(FeaturesSetup);
program.with_setup(ReportSetup);
- program.exec().await
+ program.exec_and_exit().await;
}