Skip to content

Commit

Permalink
Migrate to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
NullVoxPopuli committed Jun 10, 2023
1 parent 527839c commit 09e5b5b
Show file tree
Hide file tree
Showing 6 changed files with 11,323 additions and 11,158 deletions.
30 changes: 11 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v4
- run: yarn install --frozen-lockfile
- run: yarn lint
- run: yarn test:ember
- uses: wyvox/action@v1
- run: pnpm lint
- run: pnpm test:ember
working-directory: addon

floating-dependencies:
Expand All @@ -33,10 +31,10 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v4
- run: yarn install --no-lockfile
- run: yarn test:ember
- uses: wyvox/action@v1
with:
pnpm-args: '--no-lockfile'
- run: pnpm test:ember
working-directory: addon

try-scenarios:
Expand All @@ -59,10 +57,7 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v4
- name: install dependencies
run: yarn install --frozen-lockfile
- uses: wyvox/action@v1
- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
working-directory: addon
Expand All @@ -81,13 +76,10 @@ jobs:
- next

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v4
- name: install dependencies
run: yarn install --frozen-lockfile
- uses: wyvox/action@v1
- name: install TS version
run: yarn install --dev typescript@${{matrix.ts-version}}
run: pnpm install --save-dev typescript@${{matrix.ts-version}}
working-directory: addon
- name: test types
run: yarn test:types
run: pnpm test:types
working-directory: addon
2 changes: 1 addition & 1 deletion addon/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
useYarn: true,
usePnpm: true,
scenarios: [
{
name: 'ember-lts-3.28',
Expand Down
11 changes: 4 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@
"license": "MIT",
"repository": "https://github.com/emberjs/ember-qunit",
"scripts": {
"lint": "yarn workspaces run lint",
"lint:fix": "yarn workspaces run lint:fix",
"test": "yarn workspaces run test"
"lint": "pnpm --filter '*' lint",
"lint:fix": "pnpm --filter '*' lint:fix",
"test": "pnpm --filter '*' test"
},
"workspaces": [
"addon"
],
"volta": {
"node": "18.16.0",
"yarn": "1.22.19"
"pnpm": "8.6.1"
}
}
Loading

0 comments on commit 09e5b5b

Please sign in to comment.