Skip to content

Commit

Permalink
fix: try ci variation
Browse files Browse the repository at this point in the history
  • Loading branch information
NachoVazquez committed Aug 24, 2021
1 parent 34129ec commit b47842d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions libs/internal/console-driver/test-util/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"declaration": true,
"inlineSources": true,
"types": [],
"module": "esnext",
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
Expand Down
1 change: 1 addition & 0 deletions libs/internal/test-util/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"declaration": true,
"inlineSources": true,
"types": [],
"module": "esnext",
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit b47842d

Please sign in to comment.