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

[v18.x] build: fix bad backport #44642

Closed
wants to merge 1 commit into from

Conversation

sgallagher
Copy link
Contributor

@sgallagher sgallagher commented Sep 14, 2022

The upstream merge of e27e709d3c
into v18 accidentally removed code related to systemtap and dtrace.

Signed-off-by: Stephen Gallagher sgallagh@redhat.com

The upstream merge of nodejs@e27e709d3c
accidentally removed code related to systemtap and dtrace.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. needs-ci PRs that need a full CI run. python PRs and issues that require attention from people who are familiar with Python. v18.x Issues that can be reproduced on v18.x or PRs targeting the v18.x-staging branch. labels Sep 14, 2022
@sgallagher
Copy link
Contributor Author

sgallagher commented Sep 14, 2022

For the record, the merge to the main branch was fine: 8a1aa55

@RafaelGSS
Copy link
Member

RafaelGSS commented Sep 14, 2022

Thanks @sgallagher.

@nodejs/releasers should we land a patch? or it's fine to wait for v18.10 (2022-09-20)?

Copy link
Member

@RafaelGSS RafaelGSS left a comment

LGTM.

@RafaelGSS RafaelGSS changed the base branch from v18.x to v18.x-staging Sep 14, 2022
@richardlau
Copy link
Member

richardlau commented Sep 14, 2022

@nodejs/releasers should we land a patch? or it's fine to wait for v18.10 (2022-09-20)?

This doesn't affect our release binaries but may affect those building from source. I think we land this on v18.x-staging but it can wait for the next release of 18.x.

@aduh95 aduh95 changed the title build: Fix bad upstream merge [v18.x] build: fix bad backport Sep 14, 2022
@sgallagher
Copy link
Contributor Author

sgallagher commented Sep 15, 2022

I agree, it can wait for 18.10. I'll carry the patch locally for Fedora in the meantime.

@RafaelGSS RafaelGSS added the request-ci Add this label to start a Jenkins CI on a PR. label Sep 16, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Sep 16, 2022
@nodejs-github-bot
Copy link
Contributor

nodejs-github-bot commented Sep 16, 2022

@RafaelGSS
Copy link
Member

RafaelGSS commented Sep 23, 2022

Landed in 1315a83

@RafaelGSS RafaelGSS closed this Sep 23, 2022
RafaelGSS pushed a commit that referenced this pull request Sep 23, 2022
The upstream merge of e27e709d3c
accidentally removed code related to systemtap and dtrace.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
PR-URL: #44642
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
@RafaelGSS RafaelGSS mentioned this pull request Sep 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI. needs-ci PRs that need a full CI run. python PRs and issues that require attention from people who are familiar with Python. v18.x Issues that can be reproduced on v18.x or PRs targeting the v18.x-staging branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants