Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Broken release build for Hipcheck. #325

Merged
merged 1 commit into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hipcheck/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
license = "Apache-2.0"
homepage = "https://mitre.github.io/hipcheck"
repository = "https://github.com/mitre/hipcheck"
include = ["src/**/*", "../LICENSE", "../README.md", "build.rs"]
include = ["src/**", "../LICENSE", "../README.md", "build.rs", "proto/**"]

# Rename the binary from the default "hipcheck" (based on the package name)
# to "hc".
Expand Down Expand Up @@ -141,6 +141,7 @@ zstd = "0.13.2"
[build-dependencies]

anyhow = "1.0.86"
pathbuf = "1.0.0"
tonic-build = "0.12.1"
which = { version = "6.0.3", default-features = false }

Expand Down
10 changes: 8 additions & 2 deletions hipcheck/build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
// SPDX-License-Identifier: Apache-2.0

fn main() -> anyhow::Result<()> {
tonic_build::compile_protos("../proto/hipcheck/v1/hipcheck.proto")?;
use anyhow::Result;
use pathbuf::pathbuf;
use tonic_build::compile_protos;

fn main() -> Result<()> {
let root = env!("CARGO_MANIFEST_DIR");
let path = pathbuf![root, "proto", "hipcheck", "v1", "hipcheck.proto"];
compile_protos(path)?;
Ok(())
}
2 changes: 1 addition & 1 deletion plugins/dummy_rand_data/build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Apache-2.0

fn main() -> anyhow::Result<()> {
tonic_build::compile_protos("../../proto/hipcheck/v1/hipcheck.proto")?;
tonic_build::compile_protos("../../hipcheck/proto/hipcheck/v1/hipcheck.proto")?;
Ok(())
}
2 changes: 1 addition & 1 deletion plugins/dummy_sha256/build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Apache-2.0

fn main() -> anyhow::Result<()> {
tonic_build::compile_protos("../../proto/hipcheck/v1/hipcheck.proto")?;
tonic_build::compile_protos("../../hipcheck/proto/hipcheck/v1/hipcheck.proto")?;
Ok(())
}