Skip to content

Commit

Permalink
chore: Enable tracy updates now, it should be safe...?
Browse files Browse the repository at this point in the history
  • Loading branch information
Dinnerbone committed Nov 27, 2024
1 parent fa37f44 commit d81b92f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ updates:
update-types:
- "minor"
- "patch"
ignore:
- dependency-name: "tracing-tracy"
- dependency-name: "tracy-client"
- dependency-name: "profiling"
labels:
- "T-chore"
- "A-deps"
4 changes: 2 additions & 2 deletions Cargo.lock

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

3 changes: 1 addition & 2 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ license-files = [
multiple-versions = "warn"

deny = [
# We are manually pinning `tracing-tracy` to match the version used by
# `profiling`, but this can get stale easily.
# Multiple version of this will conflict
{ name = "tracy-client", deny-multiple-versions = true },
# Having multiple versions of this can silently cause images (such as
# the logo in the about dialog) in egui to not appear.
Expand Down
3 changes: 1 addition & 2 deletions desktop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ toml_edit = { version = "0.22.22", features = ["parse"] }
gilrs = "0.11"
tokio = { workspace = true, features = ["rt-multi-thread", "macros"]}

# Deliberately held back to match tracy client used by profiling crate
tracing-tracy = { version = "=0.11.1", optional = true, features = ["demangle"] }
tracing-tracy = { version = "0.11.3", optional = true, features = ["demangle"] }
rand = "0.8.5"
thiserror.workspace = true

Expand Down

0 comments on commit d81b92f

Please sign in to comment.