Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include lox/xhprof in the Matomo build release #18143

Merged
merged 3 commits into from Oct 20, 2021
Merged

Include lox/xhprof in the Matomo build release #18143

merged 3 commits into from Oct 20, 2021

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Oct 13, 2021

Description:

fix #17939

Review

@tsteur tsteur added the Needs Review PRs that need a code review label Oct 13, 2021
@tsteur tsteur added this to the 4.6.0 milestone Oct 13, 2021
@sgiehl
Copy link
Member

sgiehl commented Oct 18, 2021

Wondering if we also need to update

matomo/core/Composer/ScriptHandler.php

Line 21 in 1155273

if (! is_dir('vendor/facebook/xhprof/extension')) {
and the referenced shell script, as it still uses facebook/, while the package now uses lox/

@tsteur
Copy link
Member Author

tsteur commented Oct 18, 2021

@sgiehl changed those. Not really sure though it's generally still needed.

@sgiehl
Copy link
Member

sgiehl commented Oct 19, 2021

If it's not needed, guess we should simply remove it. There also seems to be a build-xhprof.sh, not sure what it was good for and why it is not called in ScriptHandler::buildXhprof 🤷
Btw. Guess it might be needed to run a composer update after this was merged, otherwise it might remain in the dev packages in composer.lock.

@tsteur
Copy link
Member Author

tsteur commented Oct 19, 2021

I removed these scripts for now. We can always add back if needed for some reason.

@sgiehl sgiehl merged commit 073fbfc into 4.x-dev Oct 20, 2021
@sgiehl sgiehl deleted the m17939 branch October 20, 2021 07:00
@sgiehl sgiehl mentioned this pull request Oct 20, 2021
Closed
@justinvelluppillai justinvelluppillai added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Nov 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgiehl sgiehl sgiehl approved these changes

Assignees
No one assigned
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
4.6.0
Development

Successfully merging this pull request may close these issues.

Include lox/xhprof in the Matomo build release so Profiling works
3 participants
@tsteur @sgiehl @justinvelluppillai