diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cf2eee8afcb..f019db146dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: uses: ./.github/actions/cached-install with: node-version: 18.x - install-system-deps: true + install-system-deps: false - name: Build fabric.js uses: ./.github/actions/build-fabric-cached node-coverage: @@ -35,7 +35,7 @@ jobs: - uses: ./.github/actions/cached-install with: node-version: 18.x - install-system-deps: true + install-system-deps: false - name: Build fabric.js uses: ./.github/actions/build-fabric-cached - name: Run ${{ matrix.suite }} tests with coverage @@ -88,7 +88,7 @@ jobs: - uses: ./.github/actions/cached-install with: node-version: ${{ matrix.node-version }} - install-system-deps: true + install-system-deps: ${{ matrix.node-version }} == '20.x' - name: Build fabric.js uses: ./.github/actions/build-fabric-cached - name: Run ${{ matrix.suite }} tests @@ -101,7 +101,7 @@ jobs: - uses: ./.github/actions/cached-install with: node-version: 18.x - install-system-deps: true + install-system-deps: false - name: Run Jest unit test run: npm run test:jest:coverage - name: Upload test coverage diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e895034968..eb33d0c9597 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [next] +- ci(): Install system deps only when necessary [#9086](https://github.com/fabricjs/fabric.js/pull/9086) - fix(util, Path): path distance measurement fix for M cmd [#9076](https://github.com/fabricjs/fabric.js/pull/9076) - chore(TS): Image class type checks, BREAKING change to FromURL static method [#9036](https://github.com/fabricjs/fabric.js/pull/9036) - ci(): properly checkout head for stats [#9080](https://github.com/fabricjs/fabric.js/pull/9080) diff --git a/package-lock.json b/package-lock.json index 7d7d606e661..cbb3c9ebf4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,7 +63,7 @@ "node": ">=14.0.0" }, "optionalDependencies": { - "canvas": "^2.8.0", + "canvas": "^2.11.2", "jsdom": "^20.0.1" } }, @@ -4186,9 +4186,10 @@ "license": "CC-BY-4.0" }, "node_modules/canvas": { - "version": "2.11.0", + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz", + "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==", "hasInstallScript": true, - "license": "MIT", "optional": true, "dependencies": { "@mapbox/node-pre-gyp": "^1.0.0", @@ -14760,7 +14761,9 @@ "dev": true }, "canvas": { - "version": "2.11.0", + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz", + "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==", "optional": true, "requires": { "@mapbox/node-pre-gyp": "^1.0.0", diff --git a/package.json b/package.json index 6f75a7bce18..494b6abfd0d 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "babel-src": "babel --no-babelrc src --extensions '.ts' --ignore 'src/constants.ts' --out-dir dist/src --config-file ./.babelrcAlt" }, "optionalDependencies": { - "canvas": "^2.8.0", + "canvas": "^2.11.2", "jsdom": "^20.0.1" }, "devDependencies": {