From badcc62420d708873f204616559a374f123d9b55 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Wed, 17 Jan 2024 00:31:43 +0100 Subject: [PATCH 1/2] adjust ci for devel --- .gitea/workflows/cargo.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/cargo.yaml b/.gitea/workflows/cargo.yaml index 65ce966..bd59079 100644 --- a/.gitea/workflows/cargo.yaml +++ b/.gitea/workflows/cargo.yaml @@ -1,5 +1,8 @@ name: Cargo Check, Format, Fix and Test -on: [push, pull_request] +on: + push: + branches: + - devel jobs: format: -- 2.40.1 From 7160ee2ee7336d0df5af4d975c98ae9c24e66374 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Wed, 17 Jan 2024 01:14:49 +0100 Subject: [PATCH 2/2] publish needs versions everywhere --- .gitea/workflows/cargo-publish.yaml | 8 +++++++- Cargo.toml | 16 +++++++++------- members/libpt-bin/Cargo.toml | 9 ++++++++- members/libpt-bintols/Cargo.toml | 4 ++-- members/libpt-ccc/Cargo.toml | 6 +++--- members/libpt-core/Cargo.toml | 2 +- members/libpt-hedu/Cargo.toml | 4 ++-- members/libpt-net/Cargo.toml | 6 +++--- 8 files changed, 35 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/cargo-publish.yaml b/.gitea/workflows/cargo-publish.yaml index 0e067b2..bfd0798 100644 --- a/.gitea/workflows/cargo-publish.yaml +++ b/.gitea/workflows/cargo-publish.yaml @@ -19,4 +19,10 @@ jobs: - run: cargo fix --all-features --all-targets - run: cargo fmt --all - run: cargo test --all-features --all-targets - - run: cargo publish --index "https://git.cscherr.de/PlexSheep/_cargo-index.git --dry-run + - run: | + for CRATE in {libpt-log,libpt-core,libpt-math,libpt-ccc,libpt-bintols,libpt-hedu,libpt-net,libpt-bin,libpt}; do + cargo publish \ + --index "https://git.cscherr.de/PlexSheep/_cargo-index.git" \ + -p $CRATE + ; + done diff --git a/Cargo.toml b/Cargo.toml index 4f081b9..4dd5d82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,8 @@ categories = [ [workspace.dependencies] anyhow = "1.0.79" thiserror = "1.0.56" +libpt-log = { version = "0.2.3", path = "../libpt-log" } +libpt-bintols = { version = "0.2.3", ath = "../libpt-bintols" } [package] name = "libpt" @@ -69,10 +71,10 @@ crate-type = [ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libpt-bintols = { path = "members/libpt-bintols" } -libpt-core = { path = "members/libpt-core" } -libpt-hedu = { path = "members/libpt-hedu" } -libpt-log = { path = "members/libpt-log" } -libpt-math = { path = "members/libpt-math" } -libpt-ccc = { path = "members/libpt-ccc" } -libpt-net = { path = "members/libpt-net" } +libpt-bintols = { version = "0.2.3", path = "members/libpt-bintols" } +libpt-core = { version = "0.2.3", path = "members/libpt-core" } +libpt-hedu = { version = "0.2.3", path = "members/libpt-hedu" } +libpt-log = { version = "0.2.3", path = "members/libpt-log" } +libpt-math = { version = "0.2.3", path = "members/libpt-math" } +libpt-ccc = { version = "0.2.3", path = "members/libpt-ccc" } +libpt-net = { version = "0.2.3", path = "members/libpt-net" } diff --git a/members/libpt-bin/Cargo.toml b/members/libpt-bin/Cargo.toml index 8e926af..3fe1250 100644 --- a/members/libpt-bin/Cargo.toml +++ b/members/libpt-bin/Cargo.toml @@ -31,4 +31,11 @@ path = "src/main/mod.rs" clap = { version = "4.4.4", features = ["derive"] } clap-num = "1.0.2" clap-verbosity-flag = "2.0.1" -libpt = {path = "../..", features = ["default", "ccc", "math", "hedu", "net", "log"] } +libpt = { version = "0.2.3", path = "../..", features = [ + "default", + "ccc", + "math", + "hedu", + "net", + "log", +] } diff --git a/members/libpt-bintols/Cargo.toml b/members/libpt-bintols/Cargo.toml index edcad06..2630dcc 100644 --- a/members/libpt-bintols/Cargo.toml +++ b/members/libpt-bintols/Cargo.toml @@ -16,5 +16,5 @@ categories.workspace = true [dependencies] num-traits = "0.2.16" -libpt-core = { path = "../libpt-core" } -libpt-log = { path = "../libpt-log" } +libpt-core = { version = "0.2.3", path = "../libpt-core" } +libpt-log = { version = "0.2.3", path = "../libpt-log" } diff --git a/members/libpt-ccc/Cargo.toml b/members/libpt-ccc/Cargo.toml index 2487526..d01ab79 100644 --- a/members/libpt-ccc/Cargo.toml +++ b/members/libpt-ccc/Cargo.toml @@ -17,6 +17,6 @@ categories.workspace = true [dependencies] num = "0.4.1" num-traits = "0.2.16" -libpt-core = { path = "../libpt-core" } -libpt-log = { path = "../libpt-log" } -libpt-math = { path = "../libpt-math" } +libpt-core = { version = "0.2.3", path = "../libpt-core" } +libpt-log = { version = "0.2.3", path = "../libpt-log" } +libpt-math = { version = "0.2.3", path = "../libpt-math" } diff --git a/members/libpt-core/Cargo.toml b/members/libpt-core/Cargo.toml index 769f494..2df126e 100644 --- a/members/libpt-core/Cargo.toml +++ b/members/libpt-core/Cargo.toml @@ -15,4 +15,4 @@ categories.workspace = true [dependencies] anyhow = "1.0.79" cucumber = "0.20.2" -libpt-log = {path = "../libpt-log" } +libpt-log = { version = "0.2.3", path = "../libpt-log" } diff --git a/members/libpt-hedu/Cargo.toml b/members/libpt-hedu/Cargo.toml index 4bfcad2..5eb4434 100644 --- a/members/libpt-hedu/Cargo.toml +++ b/members/libpt-hedu/Cargo.toml @@ -17,5 +17,5 @@ categories.workspace = true [dependencies] anyhow = { workspace = true } thiserror = { workspace = true } -libpt-log = {path = "../libpt-log" } -libpt-bintols = {path = "../libpt-bintols" } +libpt-log = { version = "0.2.3", path = "../libpt-log" } +libpt-bintols = { version = "0.2.3", path = "../libpt-bintols" } diff --git a/members/libpt-net/Cargo.toml b/members/libpt-net/Cargo.toml index a840069..1f70680 100644 --- a/members/libpt-net/Cargo.toml +++ b/members/libpt-net/Cargo.toml @@ -16,9 +16,9 @@ categories.workspace = true [dependencies] humantime = "2.1.0" -libpt-core = { path = "../libpt-core" } -libpt-log = { path = "../libpt-log" } -libpt-math = { path = "../libpt-math" } +libpt-core = { version = "0.2.3", path = "../libpt-core" } +libpt-log = { version = "0.2.3", path = "../libpt-log" } +libpt-math = { version = "0.2.3", path = "../libpt-math" } reqwest = { version = "0.11.20", features = ["blocking"] } serde = { version = "1.0.188", features = ["serde_derive"] } serde_json = "1.0.107" -- 2.40.1