From 18645a72f0d174b469bd2741830d1903f7822408 Mon Sep 17 00:00:00 2001 From: plainheart Date: Thu, 20 Apr 2023 18:25:41 +0800 Subject: [PATCH 1/2] chore: update `jest-canvas-mock` to fix test fails on node v18 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce7ad04193..a85e30fb0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "globby": "11.0.0", "husky": "^4.2.5", "jest": "^26.6.1", - "jest-canvas-mock": "^2.2.0", + "jest-canvas-mock": "^2.5.0", "jshint": "2.13.5", "magic-string": "^0.25.7", "open": "6.4.0", @@ -7419,9 +7419,9 @@ } }, "node_modules/jest-canvas-mock": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.3.0.tgz", - "integrity": "sha512-3TMyR66VG2MzAW8Negzec03bbcIjVJMfGNvKzrEnbws1CYKqMNkvIJ8LbkoGYfp42tKqDmhIpQq3v+MNLW2A2w==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.5.0.tgz", + "integrity": "sha512-s2bmY2f22WPMzhB2YA93kiyf7CAfWAnV/sFfY9s48IVOrGmwui1eSFluDPesq1M+7tSC1hJAit6mzO0ZNXvVBA==", "dev": true, "dependencies": { "cssfontparser": "^1.2.1", @@ -19442,9 +19442,9 @@ } }, "jest-canvas-mock": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.3.0.tgz", - "integrity": "sha512-3TMyR66VG2MzAW8Negzec03bbcIjVJMfGNvKzrEnbws1CYKqMNkvIJ8LbkoGYfp42tKqDmhIpQq3v+MNLW2A2w==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.5.0.tgz", + "integrity": "sha512-s2bmY2f22WPMzhB2YA93kiyf7CAfWAnV/sFfY9s48IVOrGmwui1eSFluDPesq1M+7tSC1hJAit6mzO0ZNXvVBA==", "dev": true, "requires": { "cssfontparser": "^1.2.1", diff --git a/package.json b/package.json index f082f2b705..89154d2b48 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "globby": "11.0.0", "husky": "^4.2.5", "jest": "^26.6.1", - "jest-canvas-mock": "^2.2.0", + "jest-canvas-mock": "^2.5.0", "jshint": "2.13.5", "magic-string": "^0.25.7", "open": "6.4.0", From 5fd7a07c88589728cf49245e1e0e0dc3c6ff9087 Mon Sep 17 00:00:00 2001 From: plainheart Date: Thu, 20 Apr 2023 18:40:34 +0800 Subject: [PATCH 2/2] chore: fix node version doesn't work and update node to v18 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly-next.yml | 4 +++- .github/workflows/nightly.yml | 5 ++++- .github/workflows/source-release.yml | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23981bcde3..12e06b1c1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - name: Fetch commit count @@ -58,7 +58,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nightly-next.yml b/.github/workflows/nightly-next.yml index c2a6dd870f..bf40c6e71e 100644 --- a/.github/workflows/nightly-next.yml +++ b/.github/workflows/nightly-next.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 @@ -26,6 +26,8 @@ jobs: uses: actions/setup-node@v3 with: registry-url: https://registry.npmjs.org/ + node-version: ${{ matrix.node-version }} + - name: Setup and publish nightly run: | node build/nightly/prepare.js --next diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ddbcd98412..085b80d306 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,14 +15,17 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: registry-url: https://registry.npmjs.org/ + node-version: ${{ matrix.node-version }} + - name: Setup and publish nightly run: | node build/nightly/prepare.js diff --git a/.github/workflows/source-release.yml b/.github/workflows/source-release.yml index 87b85d5ccb..b6d0e57e4b 100644 --- a/.github/workflows/source-release.yml +++ b/.github/workflows/source-release.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 @@ -56,7 +56,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 @@ -109,7 +109,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - name: Use Node.js ${{ matrix.node-version }}