Merge branch 'main' into wip-dependabot-docker

jsuereth · Aug 15, 2024 · 3f985b1 · 3f985b1
2 parents d466eeb + 923f469
commit 3f985b1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -11,6 +11,7 @@ on:
       - .github/workflows/publish-docker.yml
       - 'src/**'
       - 'crates/**'
+      - Dockerfile
 env:
   TEST_WEAVER_TAG: otel/weaver:test
 jobs:
@@ -45,5 +46,7 @@ jobs:
       if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
       with:
         push: true
+        provenance: mode=max
+        sbom: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,7 @@ rust-version = "1.76"
 [workspace.dependencies]
 serde = { version = "1.0.207", features = ["derive"] }
 serde_yaml = "0.9.32"
-serde_json = { version = "1.0.122"}
+serde_json = { version = "1.0.125"}
 thiserror = "1.0.63"
 url = "2.5.2"
 ureq = "2.10.0"
@@ -78,7 +78,7 @@ weaver_cache = { path = "crates/weaver_cache" }
 weaver_forge = { path = "crates/weaver_forge" }
 weaver_checker = { path = "crates/weaver_checker" }
 
-clap = { version = "4.5.14", features = ["derive"] }
+clap = { version = "4.5.15", features = ["derive"] }
 rayon = "1.10.0"
 ratatui = { version = "0.28.0", features=["serde"] }
 crossterm = { version = "0.28.1", features = ["serde"] }