-
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
tools: update gyp to 0.5.0 #32698
tools: update gyp to 0.5.0 #32698
Conversation
Is there a release note for gyp 0.2.0 available somewhere? |
@aduh95 we're working on adding a changelog to gyp-extra in nodejs/gyp-next#27. Also, it's hard to add notes for v0.2.0 since it's the first real release of gyp-next and a large percentage of development was done inside this tree, so the history is fragmented. That said, it'll be much better moving forwards, I'd say. |
Nice work! @ryzokuken since a full changelog is probably unfeasible, are there any notable changes you'd like to share? |
The only changes between the current code in node-gyp are related to CI, governance and code style (linter). |
windows failed with: [vcvarsall.bat] Environment initialized for: 'x64'
Found MSVS version 16.0
configure --dest-cpu=x64
Node.js configure: Found Python 3.8.2...
Traceback (most recent call last):
File "configure", line 24, in <module>
import configure
File "D:\a\node\node\configure.py", line 1811, in <module>
run_gyp(gyp_args)
File "tools\gyp_node.py", line 54, in run_gyp
rc = gyp.main(args)
File "tools\gyp\pylib\gyp\__init__.py", line 679, in main
return gyp_main(args)
File "tools\gyp\pylib\gyp\__init__.py", line 664, in gyp_main
generator.GenerateOutput(flat_list, targets, data, params)
File "tools\gyp\pylib\gyp\generator\msvs.py", line 2196, in GenerateOutput
sln = MSVSNew.MSVSSolution(
File "tools\gyp\pylib\gyp\MSVSNew.py", line 231, in __init__
self.Write()
File "tools\gyp\pylib\gyp\MSVSNew.py", line 259, in Write
f.write(
File "tools\gyp\pylib\gyp\common.py", line 419, in write
self.tmp_file.write(s.encode("utf-8"))
TypeError: write() argument must be str, not byte |
prefix=os.path.split(filename)[1] + '.gyp.', | ||
dir=base_temp_dir) | ||
try: | ||
self.tmp_file = os.fdopen(tmp_fd, 'wb') |
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.
Here we are opening in wb
mode...
tools/gyp/pylib/gyp/common.py
Outdated
dir=base_temp_dir, | ||
) | ||
try: | ||
self.tmp_file = os.fdopen(tmp_fd, "w") |
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 here we are opening in w
mode.
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.
Is it wrong?
It came from this upstream commit that was ported in nodejs/gyp-next#11
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 am unsure but it would explain the TypeError: write() argument must be str, not byte
above.
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.
@cclauss @targos @gengjiawen could someone point me to the smallest configuration that causes gyp to fail? We could simply add a failing test and patch the relevant line highlighted by @cclauss.
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.
Looks like gyp-next
has not been add windows to CI, we can make this as a start ?
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.
@gengjiawen indeed, it has been blocked on the test failures in nodejs/gyp-next#8. I'll try to get it resolved ASAP.
@ryzokuken this needs a rebase and is this otherwise ready to review again? |
@BridgeAR yeah, I need to make a couple of changes. Sorry for being tardy, I'll find some time to do it later this week. Thanks. |
8ae28ff
to
2935f72
Compare
@ryzokuken would you like to update this to v0.3.0? Otherwise I can do it. |
@targos sure. |
@targos PTAL. |
there's a conflict |
ugh, why did someone push code to a dependency? Let me take a look :/ |
Most likely #32867. |
also, I fixed the merge conflicts locally, but I'm not sure how to proceed with this. Should I upstream these changes to gyp-next, make a new release and update this PR? |
+1 on make a new release. |
CI passed! Landing this. |
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
Landed in b79829c...f215a4d 🎉 |
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: nodejs#32698 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passes🎉
/cc @targos @cclauss @nodejs/gyp
Thanks for all the lovely work so far, everyone ❤️