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

build: fix the extra whitespace before NINJIA_ARGS #53181

Merged

Conversation

jakecastelli
Copy link
Member

@jakecastelli jakecastelli commented May 28, 2024

Fixes: #53176 (comment)
Refs: #53176

@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. labels May 28, 2024
@anonrig anonrig added fast-track PRs that do not need to wait for 48 hours to land. author ready PRs that have at least one approval, no pending requests for changes, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels May 28, 2024
Copy link
Contributor

Fast-track has been requested by @anonrig. Please 👍 to approve.

@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label May 28, 2024
@nodejs-github-bot
Copy link
Collaborator

@jakecastelli jakecastelli marked this pull request as ready for review May 28, 2024 03:32
Copy link
Member

@tniessen tniessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this effectively reverting 19f0bca? If so, then it'd be cleaner to actually git revert that commit.

That'd break building with ninja for me again, though, so we should really figure out a solution that works for everyone.

@tniessen tniessen removed the fast-track PRs that do not need to wait for 48 hours to land. label May 28, 2024
@jakecastelli
Copy link
Member Author

jakecastelli commented May 28, 2024

Hi @tniessen, do you want me to revert this commit in this PR?

I have been spending the past few hours trying to get the ninja build working as it is breaking for me as well (I am not an expert on either Makefiles or ninja and just trying to dig and learn ;)) I think I am getting close to get a fix out. Will ping you once I open that PR.

@tniessen
Copy link
Member

@jakecastelli Let's continue the discussion in #53176. Are you on macOS by any chance?

@jakecastelli
Copy link
Member Author

I am on MacOS m1

lpinca
lpinca previously approved these changes May 28, 2024
Copy link
Member

@targos targos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the right fix as discussed in #53176

@lpinca lpinca dismissed their stale review May 28, 2024 10:16

Waiting for discussion to settle

@jakecastelli jakecastelli force-pushed the fix-passing-j32-to-ninja branch from ed72a00 to b8f6690 Compare May 28, 2024 14:14
@jakecastelli jakecastelli changed the title build: passing -j number into ninja build: fix the extra whitespace before NINJIA_ARGS May 28, 2024
@jakecastelli
Copy link
Member Author

Turned out this PR I only fixed an unnecessary whitespace, but I've learned a lot ❤️ thanks everyone!

Copy link
Member

@tniessen tniessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The space is intentional — I'm pretty sure this change will break make -jn V=1.

@jakecastelli
Copy link
Member Author

The space is intentional — I'm pretty sure this change will break make -jn V=1.

oh good catch! @tniessen what if we change the position:

 150⋮    │    NINJA_ARGS = $(IMMEDIATE_NINJA_ARGS)$(filter -j%,$(MAKEFLAGS))
    ⋮ 150│    NINJA_ARGS = $(filter -j%,$(MAKEFLAGS))$(IMMEDIATE_NINJA_ARGS) 
➜  node ✗ make -j4 V=1
ninja -C out/Release -j4 -v 
ninja: Entering directory `out/Release'

@tniessen
Copy link
Member

Eh, I don't know — why are we trying to get rid of a single space in the output of make?

@anonrig
Copy link
Member

anonrig commented May 28, 2024

Eh, I don't know — why are we trying to get rid of a single space in the output of make?

Nit: My right eye twitches :-)

@jakecastelli
Copy link
Member Author

OHHH I took this one seriously 😂

@jakecastelli jakecastelli force-pushed the fix-passing-j32-to-ninja branch from b8f6690 to a6ba4cb Compare May 28, 2024 15:54
@jakecastelli
Copy link
Member Author

why are we trying to get rid of a single space in the output of make?

For the couple of hours I spent on learning how Makefile works, I think I deserve a green tick 😉 just joking, I am happy to close this PR if you are object to it.

@tniessen tniessen dismissed their stale review May 28, 2024 22:17

Not sure what this is accomplishing but I suppose it's not harmful either

@H4ad H4ad added the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 8, 2024
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Jun 8, 2024
@nodejs-github-bot
Copy link
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/53181
✔  Done loading data for nodejs/node/pull/53181
----------------------------------- PR info ------------------------------------
Title      build: fix the extra whitespace before NINJIA_ARGS (#53181)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     jakecastelli:fix-passing-j32-to-ninja -> nodejs:main
Labels     build, author ready, needs-ci
Commits    1
 - build: fix spacing before NINJA_ARGS
Committers 1
 - jakecastelli <[email protected]>
PR-URL: https://github.com/nodejs/node/pull/53181
Fixes: https://github.com/nodejs/node/issues/53176
Refs: https://github.com/nodejs/node/issues/53176
Reviewed-By: Yagiz Nizipli 
Reviewed-By: Michaël Zasso 
Reviewed-By: Luigi Pinca 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/53181
Fixes: https://github.com/nodejs/node/issues/53176
Refs: https://github.com/nodejs/node/issues/53176
Reviewed-By: Yagiz Nizipli 
Reviewed-By: Michaël Zasso 
Reviewed-By: Luigi Pinca 
--------------------------------------------------------------------------------
   ⚠  Commits were pushed since the last approving review:
   ⚠  - build: fix spacing before NINJA_ARGS
   ℹ  This PR was created on Tue, 28 May 2024 01:31:35 GMT
   ✔  Approvals: 3
   ✔  - Yagiz Nizipli (@anonrig): https://github.com/nodejs/node/pull/53181#pullrequestreview-2081601232
   ✔  - Michaël Zasso (@targos) (TSC): https://github.com/nodejs/node/pull/53181#pullrequestreview-2082953839
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/53181#pullrequestreview-2083105432
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2024-05-28T01:46:53Z: https://ci.nodejs.org/job/node-test-pull-request/59471/
   ⚠  Commits were pushed after the last Full PR CI run:
   ⚠  - build: fix spacing before NINJA_ARGS
- Querying data for job/node-test-pull-request/59471/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu
https://github.com/nodejs/node/actions/runs/9424757149

@H4ad H4ad added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Jun 8, 2024
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 8, 2024
@nodejs-github-bot nodejs-github-bot merged commit 5a446cc into nodejs:main Jun 8, 2024
31 checks passed
@nodejs-github-bot
Copy link
Collaborator

Landed in 5a446cc

targos pushed a commit that referenced this pull request Jun 20, 2024
PR-URL: #53181
Fixes: #53176
Refs: #53176
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Vinícius Lourenço Claro Cardoso <[email protected]>
eliphazbouye pushed a commit to eliphazbouye/node that referenced this pull request Jun 20, 2024
PR-URL: nodejs#53181
Fixes: nodejs#53176
Refs: nodejs#53176
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Vinícius Lourenço Claro Cardoso <[email protected]>
bmeck pushed a commit to bmeck/node that referenced this pull request Jun 22, 2024
PR-URL: nodejs#53181
Fixes: nodejs#53176
Refs: nodejs#53176
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Vinícius Lourenço Claro Cardoso <[email protected]>
marco-ippolito pushed a commit that referenced this pull request Jul 19, 2024
PR-URL: #53181
Fixes: #53176
Refs: #53176
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Vinícius Lourenço Claro Cardoso <[email protected]>
marco-ippolito pushed a commit that referenced this pull request Jul 19, 2024
PR-URL: #53181
Fixes: #53176
Refs: #53176
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Vinícius Lourenço Claro Cardoso <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. build Issues and PRs related to build files or the CI. needs-ci PRs that need a full CI run.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Passing -j32 for ninja no longer works
7 participants