Skip to content

Commit

Permalink
chore: upgrade yarn4, drop node@16
Browse files Browse the repository at this point in the history
  • Loading branch information
Brooooooklyn committed Nov 1, 2023
1 parent 67ba9a7 commit 273f674
Show file tree
Hide file tree
Showing 7 changed files with 2,597 additions and 2,579 deletions.
19 changes: 8 additions & 11 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
- uses: goto-bus-stop/setup-zig@v2
if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
with:
version: 0.10.1
version: 0.11.0

- name: Set env
if: matrix.settings.host == 'windows-latest'
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
target: 'x86_64-apple-darwin'
- host: windows-latest
target: 'x86_64-pc-windows-msvc'
node: ['16', '18']
node: ['18', '20']
runs-on: ${{ matrix.settings.host }}

steps:
Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ['16', '18']
node: ['18', '20']
runs-on: ubuntu-latest

steps:
Expand All @@ -291,7 +291,6 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
check-latest: true
cache: 'yarn'

- name: Install dependencies
Expand Down Expand Up @@ -324,7 +323,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ['16', '18']
node: ['18', '20']
runs-on: ubuntu-latest

steps:
Expand All @@ -343,7 +342,6 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
check-latest: true
cache: 'yarn'

- name: Install dependencies
Expand Down Expand Up @@ -378,7 +376,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ['16', '18']
node: ['18', '20']
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -433,7 +431,7 @@ jobs:
path: __test__/failure/**

test-linux-aarch64-musl-binding:
name: Test bindings on aarch64-unknown-linux-musl - node@${{ matrix.node }}
name: Test bindings on aarch64-unknown-linux-musl - node@lts
needs:
- build

Expand Down Expand Up @@ -487,7 +485,7 @@ jobs:
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: failure-images-aarch64-unknown-linux-musl-${{ matrix.node }}
name: failure-images-aarch64-unknown-linux-musl-lts
path: __test__/failure/**

test-linux-arm-gnueabihf-binding:
Expand All @@ -497,7 +495,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ['16', '18']
node: ['18', '20']
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -571,7 +569,6 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 18
check-latest: true
cache: 'yarn'

- name: Install dependencies
Expand Down
874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.4.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.4.cjs
yarnPath: .yarn/releases/yarn-4.0.1.cjs
6 changes: 4 additions & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ fn main() {
.static_crt(true);
}
"linux" => {
println!("cargo:rustc-cdylib-link-arg=-Wl,--allow-multiple-definition");
if compile_target_arch != "arm" {
println!("cargo:rustc-cdylib-link-arg=-Wl,--allow-multiple-definition");
}
if compile_target_env != "gnu" {
build.cpp_set_stdlib("stdc++");
} else {
Expand Down Expand Up @@ -221,6 +223,6 @@ fn main() {

println!("cargo:rustc-link-search={skia_lib_dir}");
println!("cargo:rustc-link-search={}", &out_dir);
println!("cargo:rustc-link-lib=skshaper");
println!("cargo:rustc-link-lib=static=skshaper");
napi_build::setup();
}
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,41 +63,41 @@
"version": "napi version && conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md"
},
"devDependencies": {
"@jimp/core": "^0.22.8",
"@jimp/custom": "^0.22.8",
"@jimp/jpeg": "^0.22.8",
"@jimp/png": "^0.22.8",
"@napi-rs/cli": "^2.16.2",
"@octokit/rest": "^20.0.1",
"@swc-node/register": "^1.6.6",
"@swc/core": "^1.3.71",
"@jimp/core": "^0.22.10",
"@jimp/custom": "^0.22.10",
"@jimp/jpeg": "^0.22.10",
"@jimp/png": "^0.22.10",
"@napi-rs/cli": "^2.16.4",
"@octokit/rest": "^20.0.2",
"@swc-node/register": "^1.6.8",
"@swc/core": "^1.3.95",
"@taplo/cli": "^0.5.2",
"@types/lodash": "^4.14.196",
"@types/node": "^20.4.5",
"@typescript-eslint/eslint-plugin": "^6.2.0",
"@typescript-eslint/parser": "^6.2.0",
"@types/lodash": "^4.14.200",
"@types/node": "^20.8.10",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"ava": "^5.3.1",
"benny": "^3.7.1",
"canvas": "^2.11.2",
"canvaskit-wasm": "^0.39.0",
"canvaskit-wasm": "^0.39.1",
"colorette": "^2.0.20",
"conventional-changelog-cli": "^4.0.0",
"conventional-changelog-cli": "^4.1.0",
"echarts": "^5.4.3",
"eslint": "^8.45.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-sonarjs": "^0.22.0",
"husky": "^8.0.3",
"lint-staged": "^15.0.0",
"lint-staged": "^15.0.2",
"lodash": "^4.17.21",
"npm-run-all": "^4.1.5",
"pinst": "^3.0.0",
"png.js": "^0.2.1",
"prettier": "^3.0.0",
"prettier": "^3.0.3",
"pretty-bytes": "^6.1.1",
"skia-canvas": "^1.0.1",
"table": "^6.8.1",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"lint-staged": {
"*.@(js|ts|tsx|yml|yaml|md|json|html)": [
Expand Down Expand Up @@ -133,5 +133,5 @@
"singleQuote": true,
"arrowParens": "always"
},
"packageManager": "yarn@3.6.4"
"packageManager": "yarn@4.0.1"
}
Loading

1 comment on commit 273f674

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 273f674 Previous: 67ba9a7 Ratio
Draw house#skia-canvas 26 ops/sec (±0.18%) 21.7 ops/sec (±1.39%) 0.83
Draw house#node-canvas 30 ops/sec (±0.24%) 26.9 ops/sec (±0.68%) 0.90
Draw house#@napi-rs/skia 25 ops/sec (±0.41%) 22.5 ops/sec (±1.35%) 0.90
Draw gradient#skia-canvas 25 ops/sec (±0.16%) 22.4 ops/sec (±1.19%) 0.90
Draw gradient#node-canvas 29 ops/sec (±0.31%) 26.9 ops/sec (±0.94%) 0.93
Draw gradient#@napi-rs/skia 24 ops/sec (±0.42%) 21.9 ops/sec (±1.37%) 0.91

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.