-
Notifications
You must be signed in to change notification settings - Fork 29.6k
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
deps: update c-ares to 1.18.1 #40660
Conversation
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rubber-stamp LGTM if CI is green.
We'll want to add this to the tools.yml file in #40644.
Oh wait, no we won't because this is a dependency rather than a tool. |
doc/guides/maintaining-c-ares.md
Outdated
1. Unpacking the source in a temporary workspace directory. | ||
1. Removing the `test` directory (to save disk space). | ||
1. Copying over the existing `.gitignore`, pre-generated `config` directory and |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1. Unpacking the source in a temporary workspace directory. | |
1. Removing the `test` directory (to save disk space). | |
1. Copying over the existing `.gitignore`, pre-generated `config` directory and | |
2. Unpacking the source in a temporary workspace directory. | |
3. Removing the `test` directory (to save disk space). | |
4. Copying over the existing `.gitignore`, pre-generated `config` directory and |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why we want to do that. It's a feature of markdown to write ordered lists only with ones, and I like it because it allows to add an item anywhere in the list without having te renumber everything after it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've run the formatter and committed the results (plus the comma change and reworded the bit about LICENSE updates). I kind of agree with @targos re. the GitHub flavored markdown feature but I'm not going to fight the formatter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@targos @richardlau This is a bit of a spaces vs. tabs kind of thing I suppose, but for what it's worth, I think it's better to format it this way so that the raw markdown is more easily readable. It's supposed to be one of the advantages of markdown that it is useable/understandable in its raw format. It makes things slightly harder for the author, but I think when the differences are small, we should favor the reader. (That said, I haven't looked to see if there is a configuration option in remark to change this behavior. There might be.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(And I also don't actually feel strongly about it. We do more writing markdown than reading the raw markdown probably, so... I'm just going to submit to the formatter... ¯\(ツ)/¯ )
doc/guides/maintaining-c-ares.md
Outdated
1. Replacing the existing `deps/cares` with the workspace directory. | ||
1. Modifying the `cares.gyp` file for file additions/deletions. | ||
1. Rebuilding the main Node.js `LICENSE`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1. Replacing the existing `deps/cares` with the workspace directory. | |
1. Modifying the `cares.gyp` file for file additions/deletions. | |
1. Rebuilding the main Node.js `LICENSE`. | |
5. Replacing the existing `deps/cares` with the workspace directory. | |
6. Modifying the `cares.gyp` file for file additions/deletions. | |
7. Rebuilding the main Node.js `LICENSE`. |
./tools/update-cares.sh x.y.z | ||
``` | ||
|
||
e.g. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
e.g. | |
e.g. | |
doc/guides/maintaining-c-ares.md
Outdated
./tools/license-builder.sh | ||
``` | ||
|
||
If the `LICENSE` is updated for changes other than this c-ares update those |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the `LICENSE` is updated for changes other than this c-ares update those | |
If the `LICENSE` is updated for changes other than this c-ares update, those |
git add -A deps/cares | ||
``` | ||
|
||
Add the rebuilt `LICENSE` if it has been updated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the rebuilt `LICENSE` if it has been updated. | |
Add the rebuilt `LICENSE` if it has been updated. | |
Add a script to automate updating of the c-ares dependency and accompanying maintenance guide. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Updated as described in doc/guides/maintaining-c-ares.md. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Add a script to automate updating of the c-ares dependency and accompanying maintenance guide. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Updated as described in doc/guides/maintaining-c-ares.md. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Add a script to automate updating of the c-ares dependency and accompanying maintenance guide. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Updated as described in doc/guides/maintaining-c-ares.md. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Add a script to automate updating of the c-ares dependency and accompanying maintenance guide. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Updated as described in doc/guides/maintaining-c-ares.md. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Notable changes: - **deps**: upgrade npm to 8.1.2 (npm team) [#40643](#40643) - **deps**: update c-ares to 1.18.1 (Richard Lau) [#40660](#40660) - **doc**: add VoltrexMaster to collaborators (voltrexmaster) [#40566](#40566) - **lib**: fix regular expression to detect \`/\` and \`\\\` (Francesco Trotta) [#40325](#40325) PR-URL: #40974
Notable changes: - **deps**: upgrade npm to 8.1.2 (npm team) [#40643](#40643) - **deps**: update c-ares to 1.18.1 (Richard Lau) [#40660](#40660) - **doc**: add VoltrexMaster to collaborators (voltrexmaster) [#40566](#40566) - **lib**: fix regular expression to detect \`/\` and \`\\\` (Francesco Trotta) [#40325](#40325) PR-URL: #40974
Notable changes: - **deps**: upgrade npm to 8.1.2 (npm team) [#40643](#40643) - **deps**: update c-ares to 1.18.1 (Richard Lau) [#40660](#40660) - **doc**: add VoltrexMaster to collaborators (voltrexmaster) [#40566](#40566) - **lib**: fix regular expression to detect \`/\` and \`\\\` (Francesco Trotta) [#40325](#40325) PR-URL: #40974
Add a script to automate updating of the c-ares dependency and accompanying maintenance guide. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Updated as described in doc/guides/maintaining-c-ares.md. PR-URL: #40660 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
Notable changes: - **deps**: upgrade npm to 8.1.2 (npm team) [nodejs#40643](nodejs#40643) - **deps**: update c-ares to 1.18.1 (Richard Lau) [nodejs#40660](nodejs#40660) - **doc**: add VoltrexMaster to collaborators (voltrexmaster) [nodejs#40566](nodejs#40566) - **lib**: fix regular expression to detect \`/\` and \`\\\` (Francesco Trotta) [nodejs#40325](nodejs#40325) PR-URL: nodejs#40974
Add a script to automate updating of the c-ares dependency and accompanying maintenance guide and use the script to update to c-ares 1.18.1.
I've opted to strip out the c-ares tests for space reasons (3 mb, and we didn't include them before). Other than that the script minimize the differences between what is in our source tree compared to the upstream c-ares tar balls, which does mean things being added that we did not have before (e.g. c-ares docs).