Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit afae3a3

Browse files
authoredMar 3, 2021
chore: update typescript and ensure jasmine types match internal (#6900)
* chore: update typescript and ensure jasmine types match internal * chore: fix npm caching
1 parent 4fef8bc commit afae3a3

File tree

5 files changed

+1293
-599
lines changed

5 files changed

+1293
-599
lines changed
 

‎.github/workflows/test.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/cache@v2
1919
with:
2020
path: ~/.npm
21-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
21+
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
2222
restore-keys: |
2323
${{ runner.os }}-node-
2424
- uses: actions/cache@v2
@@ -27,7 +27,7 @@ jobs:
2727
node_modules
2828
packages/*/node_modules
2929
!packages/*/node_modules/@material
30-
key: ${{ runner.os }}-lerna-${{ hashFiles('**/package-lock.json') }}
30+
key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }}
3131
- run: npm ci --ignore-scripts
3232
- run: npm run bootstrap
3333
lint:
@@ -44,7 +44,7 @@ jobs:
4444
node_modules
4545
packages/*/node_modules
4646
!packages/*/node_modules/@material
47-
key: ${{ runner.os }}-lerna-${{ hashFiles('**/package-lock.json') }}
47+
key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }}
4848
- run: npm run link
4949
- run: npm run lint
5050
conventional-commit-check:
@@ -68,7 +68,7 @@ jobs:
6868
node_modules
6969
packages/*/node_modules
7070
!packages/*/node_modules/@material
71-
key: ${{ runner.os }}-lerna-${{ hashFiles('**/package-lock.json') }}
71+
key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }}
7272
- run: npm run link
7373
- run: |
7474
npm run dist
@@ -89,7 +89,7 @@ jobs:
8989
node_modules
9090
packages/*/node_modules
9191
!packages/*/node_modules/@material
92-
key: ${{ runner.os }}-lerna-${{ hashFiles('**/package-lock.json') }}
92+
key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }}
9393
- run: npm run link
9494
- run: npm run test:site
9595
unit-test:
@@ -106,7 +106,7 @@ jobs:
106106
node_modules
107107
packages/*/node_modules
108108
!packages/*/node_modules/@material
109-
key: ${{ runner.os }}-lerna-${{ hashFiles('**/package-lock.json') }}
109+
key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }}
110110
- run: npm run link
111111
- name: Run unit tests
112112
run: |
@@ -138,7 +138,7 @@ jobs:
138138
node_modules
139139
packages/*/node_modules
140140
!packages/*/node_modules/@material
141-
key: ${{ runner.os }}-lerna-${{ hashFiles('**/package-lock.json') }}
141+
key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }}
142142
- run: npm run link
143143
- name: Run dependency tests
144144
run: |
@@ -157,7 +157,7 @@ jobs:
157157
node_modules
158158
packages/*/node_modules
159159
!packages/*/node_modules/@material
160-
key: ${{ runner.os }}-lerna-${{ hashFiles('**/package-lock.json') }}
160+
key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }}
161161
- run: npm run link
162162
- name: Run Sass tests
163163
run: |

‎karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ module.exports = function(config) {
6969
// karma-typescript: https://github.com/monounity/karma-typescript/tree/master/packages/karma-typescript
7070
karmaTypescriptConfig: {
7171
exclude: EXCLUDE_FILES,
72-
tsconfig: './tsconfig-base.json',
72+
tsconfig: './tsconfig-testing.json',
7373
},
7474
preprocessors: FILES_TO_USE.reduce((obj, file) => {
7575
obj[file] = 'karma-typescript';

0 commit comments

Comments
 (0)