From 74236f6ca2cb0cc6d4f8ddb143827ab5c95af76a Mon Sep 17 00:00:00 2001 From: Nacho Vazquez Date: Tue, 24 Aug 2021 16:45:54 -0300 Subject: [PATCH] fix: try ci variation --- .github/workflows/ci.yml | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24ff1407d..a2760357d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,6 +94,9 @@ jobs: with: angular-version: ${{ matrix.angular-version }} + - if: matrix.angular-version != '12.0.x' && matrix.angular-version != '12.1.x' && matrix.angular-version != '12.2.x' + run: yarn use-node10-jest-version + - name: Variable-Yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" @@ -140,7 +143,7 @@ jobs: angular-version: ${{ matrix.angular-version }} # use jest version compatible with Node 10 - - if: matrix.node-version == '10.0.x' + - if: matrix.angular-version != '12.0.x' && matrix.angular-version != '12.1.x' && matrix.angular-version != '12.2.x' run: yarn use-node10-jest-version - name: Variable-Yarn cache directory path diff --git a/package.json b/package.json index fe50dbecc..f41e06821 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "clean": "rimraf dist coverage reports", "configure-report-paths": "node tools/scripts/configure-report-paths.mjs", "delete-commonjs-allowlist": "json -f angular.json --in-place -e \"delete this.projects['lumberjack-app'].architect.build.options.allowedCommonJsDependencies; delete this.projects['lumberjack-schematics-app'].architect.build.options.allowedCommonJsDependencies;\"", - "use-node10-jest-version": "json -f package.json --in-place -e \"this.devDependencies['@types/jest'] = '^26.0.24'; this.devDependencies['jest'] = '^26.6.3';\"", + "use-node10-jest-version": "npx json -f package.json --in-place -e \"this.devDependencies['@types/jest'] = '^26.0.24'; this.devDependencies['jest'] = '^26.6.3';\"", "delete-path-alias": "node tools/scripts/delete-path-alias.js", "generate-lint-reports": "node tools/scripts/generate-lint-reports.mjs", "generate-test-coverage-reports": "node tools/scripts/generate-test-coverage-reports.mjs",