add nodejs/node ncrypto sync workflow#42
Open
panva wants to merge 4 commits intonodejs:mainfrom
Open
Conversation
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
Node-Base-Commit: 84aaed75978e537ebcfa82b094794fa4bb0ffa79 Node-Target-Commit: 8385efc01343a835e3a0efe05611f44272cbb413
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
This was referenced Apr 28, 2026
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This:
The sync script maps these Node.js files into this repository:
deps/ncrypto/ncrypto.h->include/ncrypto.hdeps/ncrypto/ncrypto.cc->src/ncrypto.cppdeps/ncrypto/engine.cc->src/engine.cppThe script performs a 3-way merge rather than blindly copying files:
base: the previousnodejs/nodecommit recorded in.github/sync-node-ncrypto.jsonours: the current standalone ncrypto file in this repositorytheirs: the requested targetnodejs/noderefThis applies the Node-side changes from
basetotheirsonto the standalone files while preserving standalone-only edits when possible.On the first bootstrap run (panva#6),
.github/sync-node-ncrypto.jsonhad no recorded Node commit, sobase_node_refwas supplied manually. After a successful sync, the script records the resolved target Node commit in that state file, allowing future runs to infer the merge base automatically.The script also checks whether
nodejs/nodeadded newdeps/ncryptoC/C++ source or header files that are not mapped into this repository. If it finds any, it fails rather than silently omitting files.If a 3-way merge produces conflicts, the conflicted files are still written with diff3 conflict markers, and the workflow opens the PR as a draft for manual resolution.