Skip to content

Commit 25e063e

Browse files
committed
Merge branch 'master' of github.com:DataDog/dd-trace-php into bob/windows
Signed-off-by: Bob Weinand <[email protected]>
2 parents f5ca02d + bf53bdf commit 25e063e

File tree

75 files changed

+990
-605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+990
-605
lines changed

.circleci/continue_config.yml

+149-21
Large diffs are not rendered by default.

.github/workflows/prof_correctness.yml

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
done
9494
9595
- name: Check profiler correctness for allocations
96+
if: matrix.phpts != 'zts'
9697
uses: Datadog/prof-correctness/analyze@main
9798
with:
9899
expected_json: profiling/tests/correctness/allocations.json

Cargo.lock

+98-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["components-rs", "profiling"]
2+
members = ["components-rs", "components-rs/php_sidecar_mockgen", "profiling"]
33
resolver = "2"
44

55
[workspace.package]

0 commit comments

Comments
 (0)