From 094d4b78e021c959ba473bd3dd133ebce5103b85 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Thu, 22 Jan 2026 16:42:51 +0100 Subject: [PATCH 1/7] Adds cli base --- crates/cli_parser/src/lib.rs | 7 +++++-- crates/fast_class/src/lib.rs | 10 +++++++--- crates/ravenous-tools/src/main.rs | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/crates/cli_parser/src/lib.rs b/crates/cli_parser/src/lib.rs index b3d1a51..5529c86 100644 --- a/crates/cli_parser/src/lib.rs +++ b/crates/cli_parser/src/lib.rs @@ -5,11 +5,12 @@ use clap::{Args, Parser, Subcommand}; use config::{ analysis::AnalysisConfig, + fast_tables::FastTableConfig, formatter::FormatterConfig, graph::GraphConfig, make::{ - MakeTargets, VerboseLevel, HELP_BLOCK_SELECTION, HELP_BUILD_TARGET_LIST, - HELP_VERBOSITY_LEVEL, + HELP_BLOCK_SELECTION, HELP_BUILD_TARGET_LIST, HELP_VERBOSITY_LEVEL, MakeTargets, + VerboseLevel, }, statsolver::StatConfig, tablegen::{Craft, TableArgs}, @@ -48,6 +49,8 @@ pub enum Commands { Format(FormatterConfig), /// Generate analysis data Analysis(AnalysisConfig), + /// Better Generation + BetterGen(FastTableConfig), } #[derive(Debug, Args)] diff --git a/crates/fast_class/src/lib.rs b/crates/fast_class/src/lib.rs index ead77e2..7b577fd 100644 --- a/crates/fast_class/src/lib.rs +++ b/crates/fast_class/src/lib.rs @@ -23,6 +23,9 @@ //! The module is free of external dependencies except for `facet`, which provides //! the procedural macro used for deriving serialisation support. +use anyhow::Result; +use cli_parser::Config; +use config::fast_tables::FastTableConfig; use facet::Facet; /// Represents a playable class in the game. @@ -124,9 +127,10 @@ pub trait Graphable { fn to_graph(&self) -> String; } -/// r[bulk.export] -pub fn add(left: u64, right: u64) -> u64 { - left + right +pub fn make_better_gen(args: &FastTableConfig, config: &Config) -> Result<()> { + let _ = args; + let _ = config; + todo!() } // Subcommands: // dashboard [classes, alchemy, cooking, forge] --filter name=Archer diff --git a/crates/ravenous-tools/src/main.rs b/crates/ravenous-tools/src/main.rs index a172e64..826a1bd 100644 --- a/crates/ravenous-tools/src/main.rs +++ b/crates/ravenous-tools/src/main.rs @@ -5,6 +5,7 @@ #![warn(missing_docs)] #![warn(clippy::missing_docs_in_private_items)] +use fast_class::make_better_gen; // Workspace use formatter::format_file; use graphs::make_graphs; @@ -35,6 +36,7 @@ fn main() -> Result<()> { Commands::Graphs(args) => make_graphs(&args, &config), Commands::Format(args) => format_file(&args, &config), Commands::Analysis(args) => Ok(launch_analysis(&args, &config)?), // Not using anyhow but a custom error + Commands::BetterGen(args) => make_better_gen(&args, &config), } } -- 2.45.1 From a2cb6434b1de8d53cefb8d80f6626315cd5bbf1c Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 23 Jan 2026 10:15:15 +0100 Subject: [PATCH 2/7] Makes workspace dependencies --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2b5c5bf..4d86c2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,4 +54,3 @@ glob = "0.3.3" tokio = { version = "1.52.3", features = ["full"] } dynfmt = { version = "0.1.5", features = ["curly"] } pretty_assertions = "^1.4" - -- 2.45.1 From 6ca8033308018f19ae3cf2678c998c7695ff928c Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 23 Jan 2026 10:20:53 +0100 Subject: [PATCH 3/7] Updates dependencies --- Cargo.toml | 14 ++++++++++++++ crates/fast_class/Cargo.toml | 4 ++++ crates/graphs/Cargo.toml | 4 ++++ crates/make/Cargo.toml | 7 +++++++ crates/ravenous-tools/Cargo.toml | 4 ++++ crates/weaponry/Cargo.toml | 1 + 6 files changed, 34 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 4d86c2b..ba2561f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,6 +41,7 @@ fast_class = {path = "./crates/fast_class"} formatter = {path = "./crates/formatter"} weaponry = {path = "./crates/weaponry"} +<<<<<<< HEAD anyhow = "1.0.103" toml = "1.1.2" clap = { version = "4.6.1", features = ["derive"] } @@ -52,5 +53,18 @@ csv = "1.4.0" ron = "0.12.2" glob = "0.3.3" tokio = { version = "1.52.3", features = ["full"] } +======= +anyhow = "1.0.100" +toml = "0.9.11" +clap = { version = "4.5.54", features = ["derive"] } +phf = { version = "0.13.1", features = ["macros"] } +regex = "1.12.2" +regex_static = "0.1.1" +serde = { version = "1.0.228", features = ["derive", "alloc"] } +csv = "1.4.0" +ron = "0.12.0" +glob = "0.3.3" +tokio = "1.49.0" +>>>>>>> 6becdfb (Updates dependencies) dynfmt = { version = "0.1.5", features = ["curly"] } pretty_assertions = "^1.4" diff --git a/crates/fast_class/Cargo.toml b/crates/fast_class/Cargo.toml index 61a87d4..650e91a 100644 --- a/crates/fast_class/Cargo.toml +++ b/crates/fast_class/Cargo.toml @@ -7,4 +7,8 @@ edition = "2024" config = {workspace = true} cli_parser = {workspace = true} anyhow = {workspace = true} +<<<<<<< HEAD facet = "0.46.5" +======= +facet = "0.43.1" +>>>>>>> 6becdfb (Updates dependencies) diff --git a/crates/graphs/Cargo.toml b/crates/graphs/Cargo.toml index 77e9c17..5ea7e05 100644 --- a/crates/graphs/Cargo.toml +++ b/crates/graphs/Cargo.toml @@ -7,7 +7,11 @@ edition = "2024" config = {workspace = true} cli_parser = {workspace = true} anyhow = {workspace = true} +<<<<<<< HEAD charts-rs = { version = "0.7", features = ["image-encoder"] } +======= +charts-rs = "0.3.27" +>>>>>>> 6becdfb (Updates dependencies) serde = {workspace = true} csv = {workspace = true} ron = {workspace = true} diff --git a/crates/make/Cargo.toml b/crates/make/Cargo.toml index d4a525d..486e43f 100644 --- a/crates/make/Cargo.toml +++ b/crates/make/Cargo.toml @@ -13,7 +13,14 @@ toml = {workspace = true} tokio = {workspace = true} dynfmt = {workspace = true} +<<<<<<< HEAD indicatif = { version = "0.18.6", features = ["rayon"] } logos = "0.16.1" indexmap = "2.14.0" console = "0.16.4" +======= +indicatif = { version = "0.18.3", features = ["rayon"] } +logos = "0.16.0" +indexmap = "2.13.0" +console = "0.16.2" +>>>>>>> 6becdfb (Updates dependencies) diff --git a/crates/ravenous-tools/Cargo.toml b/crates/ravenous-tools/Cargo.toml index 6044cd9..6d62479 100644 --- a/crates/ravenous-tools/Cargo.toml +++ b/crates/ravenous-tools/Cargo.toml @@ -14,9 +14,13 @@ fast_class = {workspace = true} anyhow = {workspace = true} toml = {workspace = true} clap = {workspace = true} +<<<<<<< HEAD tokio = {workspace = true} formatter = {workspace = true} weaponry = {workspace = true} +======= +tokio = { version = "1.49.0", features = ["full"] } +>>>>>>> 6becdfb (Updates dependencies) [package.metadata.cargo-machete] ignored = ["tokio"] diff --git a/crates/weaponry/Cargo.toml b/crates/weaponry/Cargo.toml index 05e4b0e..c37f6d7 100644 --- a/crates/weaponry/Cargo.toml +++ b/crates/weaponry/Cargo.toml @@ -27,6 +27,7 @@ clap = {workspace = true} fastrand = "2.4.1" criterion = { version = "0.8" } logos = "^0.16" +rayon = "1.11.0" [[bench]] name = "iter_creation" -- 2.45.1 From 222cd14d298ebbacd9c2d9ac52fc337fb3d5a581 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 23 Jan 2026 11:04:19 +0100 Subject: [PATCH 4/7] Swaps around verbosity level --- crates/make/src/makepdf_structs.rs | 31 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/crates/make/src/makepdf_structs.rs b/crates/make/src/makepdf_structs.rs index f5bc669..df23f12 100644 --- a/crates/make/src/makepdf_structs.rs +++ b/crates/make/src/makepdf_structs.rs @@ -291,34 +291,41 @@ impl LineType { /// Decides all verbose levels, for output pub(super) fn vlvl(&self) -> VerboseLevel { match &self { + LineType::PageGen => VerboseLevel::None, + LineType::Empty => VerboseLevel::None, + + LineType::LowPackageWarning(_) => VerboseLevel::Box, + LineType::BoxFullness(_) => VerboseLevel::Box, + LineType::Mode => VerboseLevel::Misc, LineType::Info(_) => VerboseLevel::Misc, LineType::StartingSequence => VerboseLevel::Misc, LineType::EndSequence => VerboseLevel::Misc, LineType::MPSConverter => VerboseLevel::Misc, - LineType::Chapter(_) => VerboseLevel::Context, - LineType::MissingReference(_) => VerboseLevel::Warning, LineType::PdfTexVersion(_) => VerboseLevel::Misc, LineType::Context(_) => VerboseLevel::Misc, LineType::LaTexVersion => VerboseLevel::Misc, LineType::WriteMode => VerboseLevel::Misc, LineType::DocumentClass => VerboseLevel::Misc, - LineType::EnteringDocument(_) => VerboseLevel::Info, - LineType::Library(_) => VerboseLevel::Context, - LineType::PackageContext(_) => VerboseLevel::Warning, - LineType::Loading(_) => VerboseLevel::Context, - LineType::Unknown(_) => VerboseLevel::Uncatchable, - LineType::PageGen => VerboseLevel::None, LineType::Output => VerboseLevel::Misc, LineType::Log => VerboseLevel::Misc, - LineType::Empty => VerboseLevel::None, LineType::GeometryResolution => VerboseLevel::Misc, LineType::GeometryFound => VerboseLevel::Misc, LineType::Transcript => VerboseLevel::Misc, - LineType::PackageWarning(_) => VerboseLevel::Warning, - LineType::LowPackageWarning(_) => VerboseLevel::Box, - LineType::BoxFullness(_) => VerboseLevel::Box, + + LineType::EnteringDocument(_) => VerboseLevel::Info, + + LineType::Library(_) => VerboseLevel::Context, + LineType::Chapter(_) => VerboseLevel::Context, + LineType::Loading(_) => VerboseLevel::Context, + + LineType::MissingReference(_) => VerboseLevel::Warning, + LineType::PackageContext(_) => VerboseLevel::Warning, LineType::Warning(_) => VerboseLevel::Warning, + LineType::PackageWarning(_) => VerboseLevel::Warning, + + LineType::Unknown(_) => VerboseLevel::Uncatchable, + LineType::WarningPrs => VerboseLevel::Critical, LineType::MissingReferencePrs => VerboseLevel::Critical, LineType::BoxFullnessPrs => VerboseLevel::Critical, -- 2.45.1 From 3460841ed75ded0912d0d635f418dc011225a142 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 23 Jan 2026 12:16:34 +0100 Subject: [PATCH 5/7] Removed nearly all phf references --- Cargo.toml | 4 +- crates/cli_parser/src/lib.rs | 10 ++-- crates/config/Cargo.toml | 1 - crates/config/src/graph.rs | 6 +-- crates/config/src/make.rs | 89 ++--------------------------------- crates/config/src/tablegen.rs | 38 +-------------- crates/tablegen/Cargo.toml | 4 +- 7 files changed, 18 insertions(+), 134 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ba2561f..f0375c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,6 @@ tokio = { version = "1.52.3", features = ["full"] } anyhow = "1.0.100" toml = "0.9.11" clap = { version = "4.5.54", features = ["derive"] } -phf = { version = "0.13.1", features = ["macros"] } regex = "1.12.2" regex_static = "0.1.1" serde = { version = "1.0.228", features = ["derive", "alloc"] } @@ -67,4 +66,7 @@ glob = "0.3.3" tokio = "1.49.0" >>>>>>> 6becdfb (Updates dependencies) dynfmt = { version = "0.1.5", features = ["curly"] } +<<<<<<< HEAD pretty_assertions = "^1.4" +======= +>>>>>>> 6a1e9d3 (Removed nearly all phf references) diff --git a/crates/cli_parser/src/lib.rs b/crates/cli_parser/src/lib.rs index 5529c86..1fd3ad2 100644 --- a/crates/cli_parser/src/lib.rs +++ b/crates/cli_parser/src/lib.rs @@ -8,10 +8,7 @@ use config::{ fast_tables::FastTableConfig, formatter::FormatterConfig, graph::GraphConfig, - make::{ - HELP_BLOCK_SELECTION, HELP_BUILD_TARGET_LIST, HELP_VERBOSITY_LEVEL, MakeTargets, - VerboseLevel, - }, + make::{MakeTargets, VerboseLevel, HELP_BLOCK_SELECTION}, statsolver::StatConfig, tablegen::{Craft, TableArgs}, }; @@ -102,18 +99,17 @@ pub struct Datagen { // The make structs #[derive(Args, Debug, Clone)] -// #[command(after_)] /// The configuration struct for the PdfMaker pub struct MakeConfig { /// The filename to compile pub filename: String, /// Special target - #[arg(short, long, help = format!("Build with a special target. [{}]", HELP_BUILD_TARGET_LIST.as_str()))] + #[arg(short, long)] pub target: Option, /// The verbosity level - #[arg(short, long, default_value = "warning", help = format!("The verbosity level. [{}]",HELP_VERBOSITY_LEVEL.as_str()))] + #[arg(short, long, default_value = "warning")] pub verbosity: VerboseLevel, /// The progress bar style diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 1fc9b4a..efe5486 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -5,5 +5,4 @@ edition = "2024" [dependencies] clap = {workspace = true} -phf = {workspace = true} serde = {workspace = true} diff --git a/crates/config/src/graph.rs b/crates/config/src/graph.rs index 39c1224..d3bccd7 100644 --- a/crates/config/src/graph.rs +++ b/crates/config/src/graph.rs @@ -2,7 +2,7 @@ // File: config/src/graph.rs //! The inner config for graph module //! -use clap::Args; +use clap::{Args, ValueEnum}; use phf::phf_map; use serde::{Deserialize, Serialize}; use std::{ops::Add, sync::LazyLock}; @@ -11,7 +11,6 @@ use std::{ops::Add, sync::LazyLock}; /// The configuration struct for the Graph pub struct GraphConfig { /// Special target - #[arg(help = format!("The target to execute [{}]", *HELP_STR_TO_GRAPH))] pub target: GraphTargetType, /// Alternative origin @@ -50,7 +49,7 @@ static HELP_STR_TO_GRAPH: LazyLock = LazyLock::new(|| { targets.join(", ").to_string() }); -#[derive(Debug, Clone)] +#[derive(ValueEnum, Debug, Clone)] /// All target type pub enum GraphTargetType { /// Load graph data from the classes @@ -62,6 +61,7 @@ pub enum GraphTargetType { /// Initialize the connfig Init, } +<<<<<<< HEAD impl From<&str> for GraphTargetType { fn from(value: &str) -> Self { if let Some(target) = STR_TO_GRAPH_TARGET_TYPE.get(&value.to_lowercase()).cloned() { diff --git a/crates/config/src/make.rs b/crates/config/src/make.rs index 4a777de..2c81156 100644 --- a/crates/config/src/make.rs +++ b/crates/config/src/make.rs @@ -2,28 +2,9 @@ // File: config/src/make.rs //! Makepdf generation structs -use phf::phf_map; +use clap::ValueEnum; use std::{collections::HashMap, fmt::Debug, sync::LazyLock}; -/// Convert str to verbosity level -static STR_TO_VERBOSITY: phf::Map<&'static str, VerboseLevel> = phf_map! { - "misc" =>VerboseLevel::Misc, - "box" => VerboseLevel::Box, - "context" => VerboseLevel::Context, - "info" => VerboseLevel::Info, - "warning" => VerboseLevel::Warning, - "error" => VerboseLevel::Error, - "critical" => VerboseLevel::Critical, -}; - -/// Convert str to build target -static STR_TO_BUILD_TARGET: phf::Map<&'static str, MakeTargets> = phf_map! { - "all" => MakeTargets::All, - "list" => MakeTargets::List, - "glossaries" => MakeTargets::Glossaries, - "clean" => MakeTargets::Clean, -}; - /// List all blocktype pub static HELP_BLOCK_SELECTION: LazyLock = LazyLock::new(|| { let mut targets = BLOCK_PROGRESSION @@ -34,27 +15,8 @@ pub static HELP_BLOCK_SELECTION: LazyLock = LazyLock::new(|| { targets.join(", ").to_string() }); -/// List all targets -pub static HELP_VERBOSITY_LEVEL: LazyLock = LazyLock::new(|| { - let mut targets = STR_TO_VERBOSITY - .values() - .map(|v| format!("{:?}", v).to_lowercase()) - .collect::>(); - targets.sort(); - targets.join(", ").to_string() -}); - -/// List all targets -pub static HELP_BUILD_TARGET_LIST: LazyLock = LazyLock::new(|| { - let targets = STR_TO_BUILD_TARGET - .values() - .map(|v| format!("{:?}", v).to_lowercase()) - .collect::>(); - targets.join(", ").to_string() -}); - /// The verbosity level -#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] +#[derive(ValueEnum, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] pub enum VerboseLevel { /// Shouldn't be printed no matter what None, @@ -70,23 +32,11 @@ pub enum VerboseLevel { Warning, /// Errors encountered requiring user input Error, - /// Uncatachable errors + /// Uncatchable errors Critical, /// Literrally uncatchable things Uncatchable, } -impl From<&str> for VerboseLevel { - fn from(value: &str) -> Self { - if let Some(target) = STR_TO_VERBOSITY.get(&value.to_lowercase()).cloned() { - target - } else { - panic!( - "Invalid debug level {}. The debug level available are (from highest verbosity to lowest): [{:?}]", - value, HELP_VERBOSITY_LEVEL - ) - } - } -} /// All progress bar styles pub static BLOCK_PROGRESSION: LazyLock> = LazyLock::new(|| { @@ -104,27 +54,9 @@ pub static BLOCK_PROGRESSION: LazyLock> = LazyLock::new( m.insert("neo".to_string(), "▰═".to_string()); m }); -// Spinners -// ▁ ▂ ▃ ▄ ▅ ▆ ▇ █ ▇ ▆ ▅ ▄ ▃ ▁ -// ▉▊▋▌▍▎▏▎▍▌▋▊▉ -// ▖ ▘ ▝ ▗ -// ┤ ┘ ┴ └ ├ ┌ ┬ ┐ -// ◢ ◣ ◤ ◥ -// ◡◡ ⊙⊙ ◠◠ -// ⣾⣽⣻⢿⡿⣟⣯⣷ ⠁⠂⠄⡀⢀⠠⠐⠈ -// .tick_strings(&[ -// "▹▹▹▹▹", -// "▸▹▹▹▹", -// "▹▸▹▹▹", -// "▹▹▸▹▹", -// "▹▹▹▸▹", -// "▹▹▹▹▸", -// "▪▪▪▪▪", -// ]), -// /// List of all alternative targets -#[derive(Debug, Clone)] +#[derive(ValueEnum, Debug, Clone)] pub enum MakeTargets { /// Make all targets All, @@ -135,16 +67,3 @@ pub enum MakeTargets { /// Make the working directory clean Clean, } - -impl From<&str> for MakeTargets { - fn from(value: &str) -> Self { - if let Some(target) = STR_TO_BUILD_TARGET.get(&value.to_lowercase()).cloned() { - target - } else { - panic!( - "Invalid build target {}. The build target available are [{:?}]", - value, HELP_BUILD_TARGET_LIST - ) - } - } -} diff --git a/crates/config/src/tablegen.rs b/crates/config/src/tablegen.rs index 82e4b88..7b54be3 100644 --- a/crates/config/src/tablegen.rs +++ b/crates/config/src/tablegen.rs @@ -2,13 +2,11 @@ // File: config/src/tablegen.rs //! Table generation structs -use clap::Args; -use phf::phf_map; +use clap::{Args, ValueEnum}; use serde::Deserialize; -use std::sync::LazyLock; /// An enumeration representing different target types. -#[derive(Debug, Clone)] +#[derive(ValueEnum, Debug, Clone)] pub enum TableGenerationTarget { /// Processes all classes Classes, @@ -20,36 +18,6 @@ pub enum TableGenerationTarget { All, } -impl From<&str> for TableGenerationTarget { - fn from(value: &str) -> Self { - if let Some(target) = STR_TO_TARGET.get(value).cloned() { - target - } else { - panic!( - "Only the following target can be used: {}", - *HELP_STR_TO_TARGET_TABLES - ) - } - } -} - -/// A mapping of string representations to target types. -static STR_TO_TARGET: phf::Map<&'static str, TableGenerationTarget> = phf_map! { - "classes" => TableGenerationTarget::Classes, - "craft" => TableGenerationTarget::Craft, - "files" => TableGenerationTarget::Files, - "all" => TableGenerationTarget::All, -}; - -/// A help of all the table targets to be built -static HELP_STR_TO_TARGET_TABLES: LazyLock = LazyLock::new(|| { - let mut targets = STR_TO_TARGET - .keys() - .map(|v| v.to_string()) - .collect::>(); - targets.sort(); - targets.join(", ").to_string() -}); /// Configuration options for processing TSV files and generating LaTeX tables. #[derive(Debug, Args)] pub struct TableArgs { @@ -58,8 +26,6 @@ pub struct TableArgs { pub export: bool, /// The kind of tables to operate on: classes, craft or files followed by a list of files - // #[arg(help = format!("The kind of tables to operate on : {}", "TODO: FIX"))] - #[arg(help = format!("The kind of tables to operate on : {}", *HELP_STR_TO_TARGET_TABLES))] pub kind: TableGenerationTarget, /// A vector of strings representing the names of TSV files to process. pub filenames: Vec, diff --git a/crates/tablegen/Cargo.toml b/crates/tablegen/Cargo.toml index ced1cac..49a0329 100644 --- a/crates/tablegen/Cargo.toml +++ b/crates/tablegen/Cargo.toml @@ -10,7 +10,9 @@ anyhow = {workspace = true} csv = {workspace = true} dynfmt = {workspace = true} glob = {workspace = true} -phf = {workspace = true} regex = {workspace = true} regex_static = {workspace = true} serde = {workspace = true} +clap = {workspace = true} +phf = { version = "0.13.1", features = ["macros"] } + -- 2.45.1 From c11ce3d21c24ce729a98b1690d58df0a82428190 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 23 Jan 2026 17:18:20 +0100 Subject: [PATCH 6/7] Adds JKfile --- Jenkinsfile | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..e3ef151 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,69 @@ +// Don't forget to add http://192.168.1.37:8080/gitea-webhook/post as a gitea webhook + +pipeline { + agent { label 'rust_no_docker' } + /* =============== + BEGIN USER CONFIG + ================== */ + + environment { + DEPLOY_DIR = "/mnt/books/rust_doc/efo/" // Important, all books are in /mnt/book + MDBOOK_BUILD_DIR = "target/doc/" + } + + stages { + stage('Checkout') { + steps { + checkout scm // Checkout intead of full clone + } + } + + stage('Update') { + steps { + sh "rustup update" + // sh "rustup show" + } + } + + /* =============== + END USER CONFIG + ================== */ + + stage('Build Book') { + steps { + script { + if (env.BRANCH_NAME == 'origin/review' || env.BRANCH_NAME == 'review' || env.BRANCH_NAME == 'origin/dev-ci' || env.BRANCH_NAME == 'dev-ci') { + sh 'cargo test' + // sh 'cargo doc' + // sh 'echo "Deploying to ${DEPLOY_DIR}"' + // sh 'mkdir -p ${DEPLOY_DIR}' + // sh 'rsync -a --delete ${MDBOOK_BUILD_DIR}/ ${DEPLOY_DIR}' + } else if (env.BRANCH_NAME == 'origin/master' || env.BRANCH_NAME == 'master') { + sh 'cargo test' + // sh 'cargo doc' + // sh 'echo "Deploying to ${DEPLOY_DIR}"' + // sh 'mkdir -p ${DEPLOY_DIR}' + // sh 'rsync -a --delete ${MDBOOK_BUILD_DIR}/ ${DEPLOY_DIR}' + } else { + echo "Unknown branch: ${env.BRANCH_NAME} - skipping build." + } + } + } + } + } + + post { + success { + publishChecks conclusion: 'SUCCESS', name: 'Build Successful', summary: 'The build was successful', text: 'The build was sucessful', title: 'Build Successful' + echo '✅ Build Deployed!' + } + failure { + publishChecks conclusion: 'FAILURE', name: 'Build Failed', summary: 'The build failed', text: 'The build was a failure', title: 'Build failed' + echo '❌Build Failed to Deploy' + } + unstable{ + publishChecks conclusion: 'ACTION_REQUIRED', name: 'Build Unstable', summary: 'Unstable build', text: 'Unstable build', title: 'Build Unstable' + } + } +} + -- 2.45.1 From 40e0885a78eac74b5dbbe66a4db94b8e24f8c7b0 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 10 Jul 2026 22:57:15 +0200 Subject: [PATCH 7/7] Post rebase fix --- Cargo.toml | 17 +---------------- crates/config/Cargo.toml | 1 + crates/config/src/graph.rs | 2 +- crates/fast_class/Cargo.toml | 4 ---- crates/graphs/Cargo.toml | 5 +---- crates/make/Cargo.toml | 7 ------- crates/ravenous-tools/Cargo.toml | 4 ---- 7 files changed, 4 insertions(+), 36 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f0375c4..64006c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,8 +40,8 @@ make = {path = "./crates/make"} fast_class = {path = "./crates/fast_class"} formatter = {path = "./crates/formatter"} weaponry = {path = "./crates/weaponry"} +more_fields = {path = "./crates/more_fields"} -<<<<<<< HEAD anyhow = "1.0.103" toml = "1.1.2" clap = { version = "4.6.1", features = ["derive"] } @@ -53,20 +53,5 @@ csv = "1.4.0" ron = "0.12.2" glob = "0.3.3" tokio = { version = "1.52.3", features = ["full"] } -======= -anyhow = "1.0.100" -toml = "0.9.11" -clap = { version = "4.5.54", features = ["derive"] } -regex = "1.12.2" -regex_static = "0.1.1" -serde = { version = "1.0.228", features = ["derive", "alloc"] } -csv = "1.4.0" -ron = "0.12.0" -glob = "0.3.3" -tokio = "1.49.0" ->>>>>>> 6becdfb (Updates dependencies) dynfmt = { version = "0.1.5", features = ["curly"] } -<<<<<<< HEAD pretty_assertions = "^1.4" -======= ->>>>>>> 6a1e9d3 (Removed nearly all phf references) diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index efe5486..8cfcc65 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -6,3 +6,4 @@ edition = "2024" [dependencies] clap = {workspace = true} serde = {workspace = true} +phf = {workspace = true} diff --git a/crates/config/src/graph.rs b/crates/config/src/graph.rs index d3bccd7..f4652ac 100644 --- a/crates/config/src/graph.rs +++ b/crates/config/src/graph.rs @@ -61,7 +61,7 @@ pub enum GraphTargetType { /// Initialize the connfig Init, } -<<<<<<< HEAD + impl From<&str> for GraphTargetType { fn from(value: &str) -> Self { if let Some(target) = STR_TO_GRAPH_TARGET_TYPE.get(&value.to_lowercase()).cloned() { diff --git a/crates/fast_class/Cargo.toml b/crates/fast_class/Cargo.toml index 650e91a..61a87d4 100644 --- a/crates/fast_class/Cargo.toml +++ b/crates/fast_class/Cargo.toml @@ -7,8 +7,4 @@ edition = "2024" config = {workspace = true} cli_parser = {workspace = true} anyhow = {workspace = true} -<<<<<<< HEAD facet = "0.46.5" -======= -facet = "0.43.1" ->>>>>>> 6becdfb (Updates dependencies) diff --git a/crates/graphs/Cargo.toml b/crates/graphs/Cargo.toml index 5ea7e05..b002d72 100644 --- a/crates/graphs/Cargo.toml +++ b/crates/graphs/Cargo.toml @@ -7,12 +7,9 @@ edition = "2024" config = {workspace = true} cli_parser = {workspace = true} anyhow = {workspace = true} -<<<<<<< HEAD charts-rs = { version = "0.7", features = ["image-encoder"] } -======= -charts-rs = "0.3.27" ->>>>>>> 6becdfb (Updates dependencies) serde = {workspace = true} csv = {workspace = true} ron = {workspace = true} glob = {workspace = true} +phf = {workspace = true} diff --git a/crates/make/Cargo.toml b/crates/make/Cargo.toml index 486e43f..d4a525d 100644 --- a/crates/make/Cargo.toml +++ b/crates/make/Cargo.toml @@ -13,14 +13,7 @@ toml = {workspace = true} tokio = {workspace = true} dynfmt = {workspace = true} -<<<<<<< HEAD indicatif = { version = "0.18.6", features = ["rayon"] } logos = "0.16.1" indexmap = "2.14.0" console = "0.16.4" -======= -indicatif = { version = "0.18.3", features = ["rayon"] } -logos = "0.16.0" -indexmap = "2.13.0" -console = "0.16.2" ->>>>>>> 6becdfb (Updates dependencies) diff --git a/crates/ravenous-tools/Cargo.toml b/crates/ravenous-tools/Cargo.toml index 6d62479..6044cd9 100644 --- a/crates/ravenous-tools/Cargo.toml +++ b/crates/ravenous-tools/Cargo.toml @@ -14,13 +14,9 @@ fast_class = {workspace = true} anyhow = {workspace = true} toml = {workspace = true} clap = {workspace = true} -<<<<<<< HEAD tokio = {workspace = true} formatter = {workspace = true} weaponry = {workspace = true} -======= -tokio = { version = "1.49.0", features = ["full"] } ->>>>>>> 6becdfb (Updates dependencies) [package.metadata.cargo-machete] ignored = ["tokio"] -- 2.45.1