Skip to content

Commit efa8518

Browse files
committed
Test multiple Typescript versions
1 parent de6ded9 commit efa8518

File tree

4 files changed

+30
-8
lines changed

4 files changed

+30
-8
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,22 @@ on:
1313

1414
jobs:
1515
test:
16-
name: "Node ${{ matrix.node }} - ${{ matrix.os }}"
16+
name: "Node ${{ matrix.node }} / TS: ${{ matrix.typescript }} - ${{ matrix.os }}"
1717
runs-on: "${{ matrix.os }}-latest"
1818

1919
strategy:
20+
fail-fast: false
2021
matrix:
2122
node: ['10', '12', '14']
2223
os: ['windows', 'ubuntu']
24+
typescript: ['latest']
25+
include:
26+
- node: 10
27+
os: ubuntu
28+
typescript: ~4.0.3
29+
- node: 14
30+
os: ubuntu
31+
typescript: ~4.5.0
2332

2433
steps:
2534
- name: Ensure long path support
@@ -28,7 +37,19 @@ jobs:
2837
- uses: volta-cli/action@v1
2938
with:
3039
node-version: ${{ matrix.node }}
40+
- name: Cache
41+
uses: actions/cache@v2
42+
with:
43+
path: |
44+
node-modules
45+
vendor/typescript
46+
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}-${{ matrix.typescript }}
47+
restore-keys: |
48+
${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}-${{ matrix.typescript }}
49+
${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
50+
${{ runner.os }}-${{ matrix.node }}-
3151
- name: install dependencies
3252
run: yarn --frozen-lockfile
53+
- run: yarn upgrade typescript@${{ matrix.typescript }}
3354
- run: yarn lint
3455
- run: yarn test

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"link-self": "yarn link && yarn link broccoli-typescript-compiler",
3737
"lint": "tslint --project tsconfig.json && tslint --project tests/tsconfig.json",
3838
"prepare": "npm run build",
39-
"test": "git submodule update --init && qunit dist/tests/*-test.js"
39+
"test": "yarn update-submodule && qunit dist/tests/*-test.js",
40+
"update-submodule": "version=$(yarn info typescript version --json | jq -r .data | cut -d '.' -f 1,2) && git submodule update --init && cd vendor/typescript && git checkout release-${version}"
4041
},
4142
"dependencies": {
4243
"broccoli-funnel": "^3.0.3",
@@ -65,7 +66,7 @@
6566
"tslint": "^5.11.0",
6667
"tslint-config-prettier": "^1.13.0",
6768
"tslint-plugin-prettier": "^1.3.0",
68-
"typescript": "^4.0.3"
69+
"typescript": "^4.5.5"
6970
},
7071
"peerDependencies": {
7172
"typescript": "^4.0.3"

vendor/typescript

Submodule typescript updated 10482 files

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2694,10 +2694,10 @@ type@^2.0.0:
26942694
resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
26952695
integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
26962696

2697-
typescript@^4.0.3:
2698-
version "4.5.4"
2699-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
2700-
integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
2697+
typescript@^4.5.5:
2698+
version "4.5.5"
2699+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
2700+
integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
27012701

27022702
uglify-js@^3.1.4:
27032703
version "3.8.0"

0 commit comments

Comments
 (0)