Merge pull request #18538 from apache/fix/jest-canvas-mock

chore: update `jest-canvas-mock` to fix test fails in node v18
apache · Apr 23, 2023 · d7ac6c3 · d7ac6c3
2 parents f22a8ed + 5fd7a07
commit d7ac6c3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 }}

diff --git a/package-lock.json b/package-lock.json
diff --git 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",