Uh oh!
There was an error while loading. Please reload this page.
deps: reflect c-ares source tree - #39653
Closed
BethGriggs wants to merge 2 commits into
Closed
Conversation
richardlau
approved these changes
Aug 3, 2021
nodejs-github-bot
commented
Aug 3, 2021
Collaborator
Uh oh!
There was an error while loading. Please reload this page.
richardlau
commented
Aug 3, 2021
Member
@BethGriggs For the Windows compile failure, try replacing |
BethGriggsforce-pushed
the
reapply-c-ares-1.17.1
branch
from
August 4, 2021 00:28
776af04 to
add6528Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
BethGriggsforce-pushed
the
reapply-c-ares-1.17.1
branch
from
August 4, 2021 09:37
47d045f to
add6528Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
cjihrig
approved these changes
Aug 4, 2021
jasnell
approved these changes
Aug 5, 2021
c-ares refactored their source tree in 1.17.0 which we did not apply in our update to 1.17.1. This commit syncs our source with their new structure for easier maintenance going forward. cares.gyp is updated accordingly. Refs: c-ares/c-ares#349 Refs: nodejs#36207
BethGriggsforce-pushed
the
reapply-c-ares-1.17.1
branch
from
August 5, 2021 18:38
185bc45 to
551aa34Comparenodejs-github-bot
commented
Aug 5, 2021
Collaborator
nodejs-github-bot
commented
Aug 5, 2021
Collaborator
richardlau
approved these changes
Aug 6, 2021
Contributor
Landed in 1ff5eac...c7a0f1d |
nodejs-github-bot pushed a commit
that referenced
this pull request
Aug 6, 2021
PR-URL: #39653 Refs: c-ares/c-ares#349 Refs: #36207 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs-github-bot pushed a commit
that referenced
this pull request
Aug 6, 2021
c-ares refactored their source tree in 1.17.0 which we did not apply in our update to 1.17.1. This commit syncs our source with their new structure for easier maintenance going forward. cares.gyp is updated accordingly. Refs: c-ares/c-ares#349 Refs: #36207 PR-URL: #39653 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
codebytere added a commit
to electron/electron
that referenced
this pull request
Aug 16, 2021
codebytere added a commit
to electron/electron
that referenced
this pull request
Aug 18, 2021
codebytere added a commit
to electron/electron
that referenced
this pull request
Aug 20, 2021
* chore: bump node in DEPS to v16.6.0 * chore: bump node in DEPS to v16.6.1 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * build: add library_files to gyp variables nodejs/node#39293 * debugger: rename internal module nodejs/node#39378 * chore: fixup patch indices * deps: extract gtest source files to deps/googletest nodejs/node#39386 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * deps: bump HdrHistogram_C to 0.11.2 nodejs/node#39462 * fixup! deps: extract gtest source files to deps/googletest * chore: bump node in DEPS to v16.6.2 * chore: update patches * deps: reflect c-ares source tree nodejs/node#39653 * deps: update c-ares to 1.17.2 nodejs/node#39724 * fix: _ReadBarrier undefined symbol error on WOA arm64 * chore: update patches * chore: bump node in DEPS to v16.7.0 * deps: upgrade to libuv 1.42.0 nodejs/node#39525 * chore: update filenames * src: remove extra semicolons outside fns * chore: fixup patch filenames * chore: sort and alphabetize disabled tests Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
BlackHole1 pushed a commit
to BlackHole1/electron
that referenced
this pull request
Aug 30, 2021
* chore: bump node in DEPS to v16.6.0 * chore: bump node in DEPS to v16.6.1 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * build: add library_files to gyp variables nodejs/node#39293 * debugger: rename internal module nodejs/node#39378 * chore: fixup patch indices * deps: extract gtest source files to deps/googletest nodejs/node#39386 * crypto: fix generateKeyPair with encoding 'jwk' nodejs/node#39319 * deps: bump HdrHistogram_C to 0.11.2 nodejs/node#39462 * fixup! deps: extract gtest source files to deps/googletest * chore: bump node in DEPS to v16.6.2 * chore: update patches * deps: reflect c-ares source tree nodejs/node#39653 * deps: update c-ares to 1.17.2 nodejs/node#39724 * fix: _ReadBarrier undefined symbol error on WOA arm64 * chore: update patches * chore: bump node in DEPS to v16.7.0 * deps: upgrade to libuv 1.42.0 nodejs/node#39525 * chore: update filenames * src: remove extra semicolons outside fns * chore: fixup patch filenames * chore: sort and alphabetize disabled tests Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
c-ares refactored their source tree in 1.17.0 which we did not apply in our update from 1.16.1 to 1.17.1. This PR syncs our source tree with their new structure for easier maintenance going forward (only for the subset of files we already had checked in).
The first commit applies some missed documentation patches so that it's more clear in the second commit that no source code has been changed during the move (aside from in
deps/cares/cares.gyp).I'm not entirely sure this is the correct thing to do, but it seemed a reasonable precursor to attempting to write some guidance on how to update c-ares in Node.js.
Refs: c-ares/c-ares#349
Refs: #36207