Skip to content

Commit 3f50a96

Browse files
authored
Merge branch 'nodejs:main' into master
2 parents 3bdda34 + c379a74 commit 3f50a96

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1077
-365
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ provide the basic information we require.
1313
1414
-->
1515

16+
Please look thru your error log for the string `gyp info using node-gyp@` and if the version number is less than the [current release of node-gyp](https://github.com/nodejs/node-gyp/releases) then __please upgrade__ using the instructions at https://github.com/nodejs/node-gyp/blob/master/docs/Updating-npm-bundled-node-gyp.md and try your command again.
17+
18+
Requests for help with [`node-sass` are very common](https://github.com/nodejs/node-gyp/issues?q=label%3A%22Node+Sass+--%3E+Dart+Sass%22). Please be aware that this package is deprecated, you should seek alternatives and avoid opening new issues about it here.
19+
1620
* **Node Version**: <!-- `node -v` and `npm -v` -->
1721
* **Platform**: <!-- `uname -a` (UNIX), or `systeminfo | findstr /B /C:"OS Name" /C:"OS Version" /C:"System Type"` (Windows) -->
1822
* **Compiler**: <!-- `cc -v` (UNIX) or `msbuild /version & cl` (Windows) -->
@@ -46,4 +50,3 @@ Usage: npm <command>
4650
</details>
4751

4852
<!-- Any further details -->
49-

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: release-please
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
release-please:

.github/workflows/tests.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,52 @@
1-
# TODO: Line 43, enable pytest --doctest-modules
1+
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
2+
# TODO: Line 48, enable pytest --doctest-modules
23

34
name: Tests
4-
on: [push, pull_request]
5+
on:
6+
push:
7+
branches: [ main ]
8+
pull_request:
9+
branches: [ main ]
510
jobs:
611
Tests:
712
strategy:
813
fail-fast: false
914
max-parallel: 15
1015
matrix:
11-
node: [12.x, 14.x, 16.x]
12-
python: [3.6, 3.8, 3.9]
16+
node: [14.x, 16.x, 18.x]
17+
python: ["3.6", "3.8", "3.10"]
1318
os: [macos-latest, ubuntu-latest, windows-latest]
1419
runs-on: ${{ matrix.os }}
1520
steps:
1621
- name: Checkout Repository
17-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
1823
- name: Use Node.js ${{ matrix.node }}
19-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v3
2025
with:
2126
node-version: ${{ matrix.node }}
2227
- name: Use Python ${{ matrix.python }}
23-
uses: actions/setup-python@v2
28+
uses: actions/setup-python@v4
2429
with:
2530
python-version: ${{ matrix.python }}
2631
env:
27-
PYTHON_VERSION: ${{ matrix.python }}
32+
PYTHON_VERSION: ${{ matrix.python }} # Why do this?
2833
- name: Install Dependencies
2934
run: |
3035
npm install --no-progress
3136
pip install flake8 pytest
3237
- name: Set Windows environment
33-
if: matrix.os == 'windows-latest'
38+
if: startsWith(matrix.os, 'windows')
3439
run: |
3540
echo 'GYP_MSVS_VERSION=2015' >> $Env:GITHUB_ENV
3641
echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
3742
- name: Lint Python
38-
if: matrix.os == 'ubuntu-latest'
43+
if: startsWith(matrix.os, 'ubuntu')
3944
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
4045
- name: Run Python tests
4146
run: python -m pytest
4247
# - name: Run doctests with pytest
4348
# run: python -m pytest --doctest-modules
49+
- name: Environment Information
50+
run: npx envinfo
4451
- name: Run Node tests
4552
run: npm test

.github/workflows/visual-studio.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
2+
3+
name: visual-studio
4+
on:
5+
push:
6+
branches: [ main ]
7+
pull_request:
8+
branches: [ main ]
9+
jobs:
10+
visual-studio:
11+
strategy:
12+
fail-fast: false
13+
max-parallel: 8
14+
matrix:
15+
os: [windows-latest]
16+
msvs-version: [2016, 2019, 2022] # https://github.com/actions/virtual-environments/tree/main/images/win
17+
runs-on: ${{ matrix.os }}
18+
steps:
19+
- name: Checkout Repository
20+
uses: actions/checkout@v3
21+
- name: Install Dependencies
22+
run: |
23+
npm install --no-progress
24+
# npm audit fix --force
25+
- name: Set Windows environment
26+
if: startsWith(matrix.os, 'windows')
27+
run: |
28+
echo 'GYP_MSVS_VERSION=${{ matrix.msvs-version }}' >> $Env:GITHUB_ENV
29+
echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
30+
- name: Environment Information
31+
run: npx envinfo
32+
- name: Run Node tests
33+
run: npm test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
*.swp
12
gyp/test
23
node_modules
34
test/.node-gyp

0 commit comments

Comments
 (0)