diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36f83a8..fc7fabb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,14 +85,12 @@ jobs: - name: Run the benchmarks uses: CodSpeedHQ/action@main - env: - CODSPEED_SKIP_UPLOAD: "true" with: - run: cargo r --release --manifest-path ../go-runner/Cargo.toml -- test -bench=. example -benchtime=500ms + run: cargo r --release --manifest-path ../go-runner/Cargo.toml -- test -bench=BenchmarkFibonacciDarwin example -benchtime=500ms working-directory: example mode: walltime - # TODO: Remove this once the runner has been released with macos support - runner-version: branch:main + # TODO: Remove this once the runner has been released with the fix + runner-version: branch:cod-2762-samply-sigkills-dsymutil go-runner-benchmarks: runs-on: codspeed-macro diff --git a/example/fib_darwin_test.go b/example/fib_darwin_test.go new file mode 100644 index 0000000..4110f24 --- /dev/null +++ b/example/fib_darwin_test.go @@ -0,0 +1,11 @@ +//go:build darwin + +package example + +import "testing" + +func BenchmarkFibonacciDarwin(b *testing.B) { + for b.Loop() { + fibonacci(25) + } +} diff --git a/go-runner/overlay/instrument-hooks.go b/go-runner/overlay/instrument-hooks.go index b1bc520..b9855fb 100644 --- a/go-runner/overlay/instrument-hooks.go +++ b/go-runner/overlay/instrument-hooks.go @@ -1,7 +1,7 @@ package testing /* -#cgo CFLAGS: -I@@INSTRUMENT_HOOKS_DIR@@/includes -Wno-format -Wno-format-security +#cgo CFLAGS: -I@@INSTRUMENT_HOOKS_DIR@@/includes -Wno-format -Wno-format-security -Wno-incompatible-pointer-types #include "@@INSTRUMENT_HOOKS_DIR@@/dist/core.c" */ import "C" diff --git a/go-runner/src/runner/overlay/instrument_hooks.rs b/go-runner/src/runner/overlay/instrument_hooks.rs index acf6a55..74b35c0 100644 --- a/go-runner/src/runner/overlay/instrument_hooks.rs +++ b/go-runner/src/runner/overlay/instrument_hooks.rs @@ -6,7 +6,7 @@ use tar::Archive; use tempfile::TempDir; const INSTRUMENT_HOOKS_REPO: &str = "CodSpeedHQ/instrument-hooks"; -const INSTRUMENT_HOOKS_COMMIT: &str = "ecdf31a3afd0fb879823e40df65129ec823d374b"; +const INSTRUMENT_HOOKS_COMMIT: &str = "b9ddb5bc654b2e6fa13eb18efcd3a45e7ecda0bb"; /// Get the instrument-hooks directory, downloading if necessary /// Downloads to /tmp/codspeed-instrument-hooks-{commit}/