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: remove duplicated code #13482

Closed
wants to merge 1 commit into from

Conversation

krydos
Copy link
Contributor

@krydos krydos commented Jun 5, 2017

Hi :)

I noticed that Makefile contains duplicated code in some places and in this PR I tired to move this code to variable where possible.

Here is exactly what I did:

  • jslint and jslint-ci had (and probably should have) the same list of directories to lint. This list was copy/pasted from one target to another. Just moved it to separated variable.

  • targets that generates json and html docs. There was pretty big bash script with very small difference for these targets. Again, the command was just moved to separated variable.

There is no issue filled for this, but I hope the change can be useful.
Thank you.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

build

@nodejs-github-bot nodejs-github-bot added the build Issues and PRs related to build files or the CI. label Jun 5, 2017
Makefile Outdated
@@ -866,15 +863,17 @@ bench: bench-net bench-http bench-fs bench-tls

bench-ci: bench

LINT_TARGETS = benchmark doc lib test tools
Copy link
Member

Choose a reason for hiding this comment

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

Nit: maybe JSLINT_TARGETS since these are the directories for JavaScript linting but there's a separate C++ linting process that lints stuff elsewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Trott completely agree. thank you :) change is done.

Makefile contains copy-pasted code in some targets
and this commit aims to remove it.
@krydos krydos force-pushed the clean-makefile-duplications branch from 32b7dba to 26082c6 Compare June 5, 2017 20:31
@Trott
Copy link
Member

Trott commented Jun 5, 2017

@nodejs/build

@jasnell
Copy link
Member

jasnell commented Jun 13, 2017

@krydos
Copy link
Contributor Author

krydos commented Jun 15, 2017

Could someone re-run the CI job please. Fails seems unrelated.

AIX error is already have filled issue here - #13577

@Trott
Copy link
Member

Trott commented Jun 15, 2017

Could someone re-run the CI job please.

Tried to start a CI job but it looks like something's not right with CI...

screen shot 2017-06-15 at 11 40 11 am

@krydos
Copy link
Contributor Author

krydos commented Jul 15, 2017

As far as I remember it was issue on CI, something with disk capacity if I'm not mistaken. It should be fixed. Could please some one re-run the CI again

@Trott
Copy link
Member

Trott commented Jul 16, 2017

@krydos
Copy link
Contributor Author

krydos commented Jul 24, 2017

Hm... every CI build here is either failing or can't be completed due to my karma I guess 🤣

Could you please help me to understand why CI check is in running tests mode for a week already?

@Trott
Copy link
Member

Trott commented Jul 24, 2017

Let's try again... CI: https://ci.nodejs.org/job/node-test-pull-request/9331/

@tniessen
Copy link
Member

New CI (GitHub integration is broken at the moment, that's why GitHub still says there are outstanding tests): https://ci.nodejs.org/job/node-test-pull-request/9684/

@tniessen
Copy link
Member

Landed in 2710616, thank you! 🎉

@tniessen tniessen closed this Aug 16, 2017
tniessen pushed a commit that referenced this pull request Aug 16, 2017
Makefile contains copy-pasted code in some targets and this commit
aims to remove it.

PR-URL: #13482
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
@krydos
Copy link
Contributor Author

krydos commented Aug 16, 2017

🎉 thank you!

@refack
Copy link
Contributor

refack commented Aug 17, 2017

@krydos thank you for updating your avatar 😄. Personally I find it helps to associate a face with the online persona.

@krydos
Copy link
Contributor Author

krydos commented Aug 18, 2017

@refack, 😄. Just got suggestion from another person that people likes real faces on avatars more than something else. I'm glad I got feedback from you immediately, it proves the theory :)

@Trott
Copy link
Member

Trott commented Aug 19, 2017

Any chance this is the cause of #14930? According to #14932, gen-doc doesn't do HTML docs. But it seems like it must have until recently...

@refack
Copy link
Contributor

refack commented Aug 19, 2017

I think that what #14932 hints at is that the $(gen-json) in the following line is a leftover from before the change:

node/Makefile

Line 506 in 467385a

[ -x $(NODE) ] && $(NODE) $(gen-json) || node

MSLaguana pushed a commit to nodejs/node-chakracore that referenced this pull request Aug 21, 2017
Makefile contains copy-pasted code in some targets and this commit
aims to remove it.

PR-URL: nodejs/node#13482
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
@refack
Copy link
Contributor

refack commented Aug 25, 2017

Confirmed fix - https://nodejs.org/download/nightly/v9.0.0-nightly20170824abced13e29/docs/api/
Should only land on v8.x with #14932 a.k.a. 8850fd4

MylesBorins pushed a commit that referenced this pull request Sep 10, 2017
Makefile contains copy-pasted code in some targets and this commit
aims to remove it.

PR-URL: #13482
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
@MylesBorins MylesBorins mentioned this pull request Sep 10, 2017
MylesBorins pushed a commit that referenced this pull request Sep 12, 2017
Makefile contains copy-pasted code in some targets and this commit
aims to remove it.

PR-URL: #13482
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
@MylesBorins
Copy link
Contributor

This does not land cleanly in LTS. Please feel free to manually backport by following the guide. Please also feel free to replace do-not-land if it is being backported

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants