Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/setup-node…
Browse files Browse the repository at this point in the history
…-4.1.0
  • Loading branch information
RickyLB authored Nov 26, 2024
2 parents 1a8ef1b + 3cd761b commit ca8ffb6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: client-sdk-linux-medium
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

Expand All @@ -42,7 +42,7 @@ jobs:
runs-on: client-sdk-linux-medium
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
runs-on: client-sdk-linux-medium
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

Expand Down
12 changes: 11 additions & 1 deletion protobufs/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ fn main() -> anyhow::Result<()> {

let services_path = Path::new(SERVICES_FOLDER);

// The contents of this folder will be copied and modified before it is
// used for code generation. Later we will suppress generation of cargo
// directives on the copy, so set a directive on the source.
println!("cargo:rerun-if-changed={}", SERVICES_FOLDER);

if !services_path.is_dir() {
anyhow::bail!("Folder {SERVICES_FOLDER} does not exist; do you need to `git submodule update --init`?");
}
Expand Down Expand Up @@ -80,7 +85,12 @@ fn main() -> anyhow::Result<()> {
fs::write(service, &*contents)?;
}

let mut cfg = tonic_build::configure();
let mut cfg = tonic_build::configure()
// We have already emitted a cargo directive to trigger a rerun on the source folder
// that the copy this builds is based on. If the directives are not suppressed, the
// crate will rebuild on every compile due to the modified time stamps post-dating
// the start time of the compile action.
.emit_rerun_if_changed(false);

// most of the protobufs in "basic types" should be Eq + Hash + Copy
// any protobufs that would typically be used as parameter, that meet the requirements of those
Expand Down

0 comments on commit ca8ffb6

Please sign in to comment.