Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: support node-v16.x #97

Merged
merged 4 commits into from
May 10, 2021
Merged

feat: support node-v16.x #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b05586a
feat: support node-v16.x
hyj1991 Apr 28, 2021
fcd3d2a
fix
hyj1991 Apr 28, 2021
c3b0771
rollback
hyj1991 May 7, 2021
2f95c0b
next nodejs image update
hyj1991 May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macOS-latest ]
node-version: [ 8, 9, 10, 11, 12, 13, 14, 15 ]
os: [ ubuntu-latest, macos-latest ]
node-version: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ]
steps:
- name: Checkout Git Source
uses: actions/checkout@master
Expand All @@ -27,4 +27,4 @@ jobs:
run: npm i -g npminstall && npminstall

- name: Continuous integration
run: npm run ci
run: npm run ci
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ xprofiler 插件支持三大主流操作系统：
- v13.x
- v14.x
- v15.x
- v16.x

更低的版本因为已经不在官方 LTS 计划中，故正常情况下不再支持。

Expand Down
3 changes: 2 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ environment:
- nodejs_version: "13"
- nodejs_version: "14"
- nodejs_version: "15"
- nodejs_version: "16"

# Install scripts. (runs after repo cloning)
install:
# Get the latest stable version of Node.js or io.js
- ps: Install-Product node $env:nodejs_version x64
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:PLATFORM
# install modules
- npm install

Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
},
"homepage": "https://github.com/X-Profiler/xprofiler#readme",
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.3",
"@mapbox/node-pre-gyp": "^1.0.4",
"moment": "^2.29.1",
"nan": "^2.14.2",
"uuid": "^8.3.2",
Expand All @@ -73,11 +73,11 @@
"mocha": "^7.2.0",
"nyc": "^15.1.0",
"tunnel-agent": "^0.6.0",
"urllib": "^2.37.0"
"urllib": "^2.37.1"
},
"xctlIpcPath": {
"unix": "xprofiler-ctl-uds-path.sock",
"win32": "xprofiler-ctl"
},
"blurryTag": "__"
}
}
1 change: 1 addition & 0 deletions scripts/7u.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const nodeVersions = [
'node-v13.14.0',
'node-v14.6.0',
'node-v15.1.0',
'node-v16.0.0',
];

build(nodeVersions);
1 change: 1 addition & 0 deletions scripts/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const nodeVersions = [
'node-v13.14.0',
'node-v14.6.0',
'node-v15.1.0',
'node-v16.0.0',
];

build(nodeVersions);
8 changes: 4 additions & 4 deletions test/start.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ describe(`xprofiler starting`, function () {
expect(aliveProcess[1]).to.be(logdir);
});

it(`.xprofiler cwd: ${aliveProcess[2]} should be ${/^([.\w()/\\:-]+|)$/}`, function () {
expect(/^([.\w()/\\:-]+|)$/.test(aliveProcess[2])).to.be.ok();
it(`.xprofiler cwd: ${aliveProcess[2]} should be ${/^([.\w()/\\:-@]+|)$/}`, function () {
expect(/^([.\w()/\\:-@]+|)$/.test(aliveProcess[2])).to.be.ok();
});

it(`.xprofiler executable: ${aliveProcess[3]} should be node-${process.version}`, function () {
Expand All @@ -66,8 +66,8 @@ describe(`xprofiler starting`, function () {
expect(version).to.be(process.version);
});

it(`.xprofiler file: ${aliveProcess[4]} should be ${/^([.\w()/\\:-]+|)$/}`, function () {
expect(/^([.\w()/\\:-]+|)$/.test(aliveProcess[4])).to.be.ok();
it(`.xprofiler file: ${aliveProcess[4]} should be ${/^([.\w()/\\:-@]+|)$/}`, function () {
expect(/^([.\w()/\\:-@]+|)$/.test(aliveProcess[4])).to.be.ok();
});

it(`.xprofiler module path: ${aliveProcess[5]} should be ${path.join(__dirname, '..')}`, function () {
Expand Down