Skip to content

Commit

Permalink
Merge pull request #666 from patricklx/fix-windows
Browse files Browse the repository at this point in the history
fix windows tests
  • Loading branch information
wagenet committed Jan 3, 2024
2 parents cd2d577 + de2082b commit a9a03ab
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 115 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16
- name: Locate Yarn Cache
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16
- name: Install Dependencies
uses: nick-fields/retry@v2
with:
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16
- name: Install Dependencies
run: yarn install --no-lockfile
- name: Build
Expand All @@ -112,7 +112,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16
- name: Locate Yarn Cache
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"resolutions": {
"@types/yargs": "17.0.13",
"@types/node": "^18.11.5",
"@types/node": "^20.10.6",
"ember-cli-htmlbars": "^6.0.1"
},
"version": "1.2.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
"@glint/core": "^1.2.1",
"@types/mocha": "^10.0.1",
"@types/vscode": "^1.68.1",
"@vscode/test-electron": "2.2.0",
"@vscode/vsce": "^2.19.0",
"@vscode/test-electron": "^2.3.8",
"@vscode/vsce": "^2.22.0",
"esbuild": "^0.15.16",
"expect": "^29.5.0",
"mocha": "^10.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test-packages/ts-ember-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"baseUrl": ".",
"module": "es6",
"experimentalDecorators": true,
"isolatedModules": true,
"isolatedModules": false, //TODO: reset to `true` when @types/node supports this for nightly ts
"paths": {
"ts-ember-app/tests/*": ["tests/*"],
"ts-ember-app/*": ["app/*"],
Expand Down
Loading

0 comments on commit a9a03ab

Please sign in to comment.