Skip to content

Commit

Permalink
refactor: Move pueue-lib back into main repository
Browse files Browse the repository at this point in the history
  • Loading branch information
Nukesor committed Dec 30, 2021
1 parent b5e1734 commit e61de3f
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 44 deletions.
10 changes: 1 addition & 9 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line 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*
Expand Down
82 changes: 74 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
homepage = "https://github.com/nukesor/pueue"
repository = "https://github.com/nukesor/pueue"
Expand All @@ -15,6 +15,9 @@ edition = "2021"
[badges]
maintenance = { status="actively-developed" }

[workspace]
members = ["lib"]

[[bin]]
name = "pueue"
path = "client/main.rs"
Expand All @@ -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"] }
Expand Down
20 changes: 0 additions & 20 deletions lib/.gitignore
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
homepage = "https://github.com/nukesor/pueue-lib"
repository = "https://github.com/nukesor/pueue-lib"
Expand Down

0 comments on commit e61de3f

Please sign in to comment.