Skip to content

Commit

Permalink
tools: update gyp-next to v0.2.1
Browse files Browse the repository at this point in the history
PR-URL: #32698
Reviewed-By: Christian Clauss <[email protected]>
Reviewed-By: Jiawen Geng <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
  • Loading branch information
ryzokuken authored and danielleadams committed Oct 6, 2020
1 parent 190d46b commit 7361a3f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 3 deletions.
27 changes: 27 additions & 0 deletions tools/gyp/.github/workflows/nodejs-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Node.js Windows integration

on: [push, pull_request]

jobs:
build-windows:
runs-on: windows-latest
steps:
- name: Clone node-gyp
uses: actions/checkout@v2
with:
path: gyp-next
- name: Clone nodejs/node
uses: actions/checkout@v2
with:
repository: nodejs/node
path: node
- name: Install deps
run: choco install nasm
- name: Replace gyp in Node.js
run: |
rm -Recurse node/tools/gyp
cp -Recurse gyp-next node/tools/gyp
- name: Build Node.js
run: |
cd node
./vcbuild.bat
2 changes: 1 addition & 1 deletion tools/gyp/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2019 Ujjwal Sharma. All rights reserved.
Copyright (c) 2020 Node.js contributors. All rights reserved.
Copyright (c) 2009 Google Inc. All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion tools/gyp/pylib/gyp/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ def __init__(self):
dir=base_temp_dir,
)
try:
self.tmp_file = os.fdopen(tmp_fd, "w")
self.tmp_file = os.fdopen(tmp_fd, "wb")
except Exception:
# Don't leave turds behind.
os.unlink(self.tmp_path)
Expand Down
2 changes: 1 addition & 1 deletion tools/gyp/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

setup(
name="gyp-next",
version="0.2.0",
version="0.2.1",
description="A fork of the GYP build system for use in the Node.js projects",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down

0 comments on commit 7361a3f

Please sign in to comment.