refactor: Move pueue-lib back into main repository
This commit is contained in:
Arne Beer
parent
b5e1734b3f
commit
e61de3fef7
|
|
@ -6,17 +6,9 @@ The `main` branch is the version of the last release. \
|
|||
A new `patch` release is usually published shortly after the PR is accepted.
|
||||
|
||||
New features should branch of the `development` branch. \
|
||||
`development` usually works with the `main` branch of the `pueue-lib` repository. \
|
||||
That way we can work with it without having to release new versions all the time.
|
||||
|
||||
If your issue also requires a PR to `pueue-lib` as well, please use your `pueue-lib` development branch as a dependency.
|
||||
```
|
||||
pueue-lib = { git = "https://github.com/YourName/pueue-lib", branch = "your_branch" }
|
||||
```
|
||||
Once the MR in the `pueue-lib` repository is merged, just change the dependency back to the original `pueue-lib/main` branch.
|
||||
|
||||
## Checklist
|
||||
|
||||
- [ ] I picked the correct source and target branch.
|
||||
- [ ] I included a new entry to the `CHANGELOG.md`.
|
||||
- [ ] (If applicable) I adjusted the wiki according to the new changes.
|
||||
- [ ] I checked if anything in the wiki needs to change.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# Generated by Cargo
|
||||
# will have compiled files and executables
|
||||
/target/
|
||||
target/
|
||||
lib/target/
|
||||
|
||||
# These are backup files generated by rustfmt
|
||||
**/*.rs.bk
|
||||
*.rs.bk
|
||||
|
||||
*_stdout*
|
||||
*_stderr*
|
||||
|
|
|
|||
|
|
@ -478,6 +478,12 @@ dependencies = [
|
|||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fuchsia-cprng"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.12.4"
|
||||
|
|
@ -885,6 +891,15 @@ version = "0.2.7"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
|
||||
|
||||
[[package]]
|
||||
name = "portpicker"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9"
|
||||
dependencies = [
|
||||
"rand 0.8.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.15"
|
||||
|
|
@ -979,7 +994,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pueue"
|
||||
version = "1.1.0-alpha.0"
|
||||
version = "2.0.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_cmd",
|
||||
|
|
@ -1013,16 +1028,19 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pueue-lib"
|
||||
version = "0.18.2-alpha.0"
|
||||
source = "git+https://github.com/Nukesor/pueue-lib?branch=main#5f22c155a25f87c021a4c67da90511a0f5050c77"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
"better-panic",
|
||||
"byteorder",
|
||||
"chrono",
|
||||
"config",
|
||||
"dirs",
|
||||
"log",
|
||||
"rand",
|
||||
"portpicker",
|
||||
"pretty_assertions",
|
||||
"rand 0.8.4",
|
||||
"rcgen",
|
||||
"rev_lines",
|
||||
"rustls",
|
||||
|
|
@ -1036,6 +1054,7 @@ dependencies = [
|
|||
"snap",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
"tempdir",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"tokio-rustls",
|
||||
|
|
@ -1057,6 +1076,19 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
|
||||
dependencies = [
|
||||
"fuchsia-cprng",
|
||||
"libc",
|
||||
"rand_core 0.3.1",
|
||||
"rdrand",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.4"
|
||||
|
|
@ -1065,7 +1097,7 @@ checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
|
|||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_core 0.6.3",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
|
|
@ -1076,9 +1108,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
"rand_core 0.6.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
|
||||
dependencies = [
|
||||
"rand_core 0.4.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.3"
|
||||
|
|
@ -1094,7 +1141,7 @@ version = "0.3.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
"rand_core 0.6.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1109,6 +1156,15 @@ dependencies = [
|
|||
"yasna",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rdrand"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
|
||||
dependencies = [
|
||||
"rand_core 0.3.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.10"
|
||||
|
|
@ -1438,6 +1494,16 @@ dependencies = [
|
|||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempdir"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
|
||||
dependencies = [
|
||||
"rand 0.4.6",
|
||||
"remove_dir_all",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.2.0"
|
||||
|
|
@ -1446,7 +1512,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
|
|||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"rand",
|
||||
"rand 0.8.4",
|
||||
"redox_syscall",
|
||||
"remove_dir_all",
|
||||
"winapi",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "pueue"
|
||||
description = "A cli tool for managing long running shell commands."
|
||||
version = "1.1.0-alpha.0"
|
||||
version = "2.0.0"
|
||||
authors = ["Arne Beer <contact@arne.beer>"]
|
||||
homepage = "https://github.com/nukesor/pueue"
|
||||
repository = "https://github.com/nukesor/pueue"
|
||||
|
|
@ -15,6 +15,9 @@ edition = "2021"
|
|||
[badges]
|
||||
maintenance = { status="actively-developed" }
|
||||
|
||||
[workspace]
|
||||
members = ["lib"]
|
||||
|
||||
[[bin]]
|
||||
name = "pueue"
|
||||
path = "client/main.rs"
|
||||
|
|
@ -31,9 +34,7 @@ name = "pueued"
|
|||
path = "daemon/main.rs"
|
||||
|
||||
[dependencies]
|
||||
#pueue-lib = "0.18.0"
|
||||
pueue-lib = { git="https://github.com/Nukesor/pueue-lib", branch="main" }
|
||||
#pueue-lib = { path="../../libraries/pueue-lib" }
|
||||
pueue-lib = { version="0.19", path="lib" }
|
||||
|
||||
anyhow = "1"
|
||||
chrono = { version="0.4", features=["serde"] }
|
||||
|
|
|
|||
|
|
@ -1,22 +1,2 @@
|
|||
# Generated by Cargo
|
||||
# will have compiled files and executables
|
||||
/target/
|
||||
|
||||
# These are backup files generated by rustfmt
|
||||
**/*.rs.bk
|
||||
|
||||
*_stdout*
|
||||
*_stderr*
|
||||
|
||||
# Ignore Cargo.lock, since this is a library
|
||||
Cargo.lock
|
||||
|
||||
# OS generated files #
|
||||
######################
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
._*
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "pueue-lib"
|
||||
description = "The shared library to work with the Pueue client and daemon."
|
||||
version = "0.18.2-alpha.0"
|
||||
version = "0.19.0"
|
||||
authors = ["Arne Beer <contact@arne.beer>"]
|
||||
homepage = "https://github.com/nukesor/pueue-lib"
|
||||
repository = "https://github.com/nukesor/pueue-lib"
|
||||
|
|
|
|||
Loading…
Reference in New Issue