Skip to content

Commit

Permalink
Set up workspace
Browse files Browse the repository at this point in the history
Signed-off-by: mulhern <amulhern@redhat.com>
  • Loading branch information
mulkieran committed Mar 12, 2024
1 parent f6cb305 commit 3ff9038
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ actions:
post-upstream-clone:
- "git clone https://github.com/mulkieran/ci -b issue_project_694 --depth=1 ../distro"
- "mv ../distro/mockbuild_test/stratisd.spec ../distro/stratisd.spec"
- "cargo install cargo-version-util"
- "cargo install cargo-get"
- "cargo install cargo-vendor-filterer"
create-archive:
- "sh -c 'python3 ../distro/release_management/create_artifacts.py ../distro/ --pre-release --specfile-path=../distro/stratisd.spec stratisd --vendor-method=filtered'"
fix-spec-file:
- "echo 'skipping automatic fix-spec-file actions'"
get-current-version:
- "cargo version-util get-version"
- "cargo get package.version"

srpm_build_deps:
- git
Expand Down
14 changes: 11 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "stratisd"
version = "3.7.0"
authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
edition = "2021"
rust-version = "1.71.1" # LOWEST SUPPORTED RUST TOOLCHAIN
authors.workspace = true
edition.workspace = true
rust-version.workspace = true
build = "build.rs"
description = "Stratis daemon"
license = "MPL-2.0"
Expand Down Expand Up @@ -31,6 +31,14 @@ exclude = [
"/udev"
]

[workspace]
members = [".", "stratisd_proc_macros"]

[workspace.package]
authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
edition = "2021"
rust-version = "1.71.1" # LOWEST SUPPORTED RUST TOOLCHAIN

[[bin]]
name = "stratisd"
required-features = ["engine"]
Expand Down
6 changes: 3 additions & 3 deletions stratisd_proc_macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "stratisd_proc_macros"
version = "0.2.1"
authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
edition = "2021"
rust-version = "1.71.1" # LOWEST SUPPORTED RUST TOOLCHAIN
authors.workspace = true
edition.workspace = true
rust-version.workspace = true
description = "Stratis daemon procedural macros"
license = "MPL-2.0"
repository = "https://github.com/stratis-storage/stratisd/"
Expand Down

0 comments on commit 3ff9038

Please sign in to comment.