Skip to content

Commit 612399d

Browse files
feat: make samply-codspeed a submodule rather than git rev with cargo
Working locally with this was extremely annoying, and the script was actually a stupid workaround compared to just using a submodule.
1 parent 2533b0c commit 612399d

6 files changed

Lines changed: 26 additions & 146 deletions

File tree

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "crates/instrument-hooks-bindings/instrument-hooks"]
22
path = crates/instrument-hooks-bindings/instrument-hooks
33
url = https://github.com/CodSpeedHQ/instrument-hooks.git
4+
[submodule "crates/samply-codspeed"]
5+
path = crates/samply-codspeed
6+
url = https://github.com/CodSpeedHQ/samply-codspeed.git

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ repos:
1717
rev: v1.0
1818
hooks:
1919
- id: fmt
20-
args: [--all, --]
20+
args: [--]
21+
pass_filenames: false
2122
- id: clippy
2223
args: [--all-targets, --, -D, warnings]
2324
- repo: https://github.com/cpp-linter/cpp-linter-hooks

Cargo.lock

Lines changed: 17 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ rmp-serde = "1.3.1"
6868
uuid = { version = "1.23.1", features = ["v4"] }
6969
which = "8.0.2"
7070
crc32fast = "1.5.0"
71-
samply = { git = "https://github.com/CodSpeedHQ/samply-codspeed", rev = "81ba2c346e71" }
71+
samply = { path = "crates/samply-codspeed/samply" }
7272

7373
# Memory profiling (memtrack) and the capability handling around it are Linux-only.
7474
[target.'cfg(target_os = "linux")'.dependencies]
@@ -96,6 +96,7 @@ members = [
9696
"crates/exec-harness",
9797
"crates/instrument-hooks-bindings",
9898
]
99+
exclude = ["crates/samply-codspeed"]
99100

100101
[workspace.dependencies]
101102
anyhow = "1.0"
@@ -106,7 +107,7 @@ serde_json = "1.0"
106107
serde = { version = "1.0.228", features = ["derive"] }
107108
ipc-channel = "0.20"
108109
itertools = "0.14.0"
109-
linux-perf-event-reader = "0.10.2" # matches the version linux-perf-data resolves to
110+
linux-perf-event-reader = "0.10.2" # matches the version linux-perf-data resolves to
110111
env_logger = "0.11.10"
111112
tempfile = "3.27.0"
112113
object = { version = "0.39", default-features = false, features = ["read_core", "elf"] }

crates/samply-codspeed

Submodule samply-codspeed added at 81ba2c3

scripts/samply-dev.sh

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)