Skip to content

Commit

Permalink
Use pnpm package manager
Browse files Browse the repository at this point in the history
... instead of `yarn`

see https://pnpm.io/
  • Loading branch information
Turbo87 committed Jul 1, 2021
1 parent 66afeed commit 6c7e153
Show file tree
Hide file tree
Showing 6 changed files with 11,961 additions and 12,305 deletions.
55 changes: 13 additions & 42 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,12 @@ jobs:
with:
node-version: 12.x

- name: get yarn cache dir
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
- uses: pnpm/action-setup@v2.0.1
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-lint-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: install dependencies
run: yarn install
version: 5.18.9
run_install: true

- name: lint
run: yarn lint
- run: pnpm lint

test:
name: Node Tests
Expand All @@ -52,22 +42,13 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- name: get yarn cache dir
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
- uses: pnpm/action-setup@v2.0.1
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-test-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
version: 5.18.9
run_install: true

- name: install dependencies
run: yarn install

- name: node tests
run: yarn test:node
- run: pnpm pretest:node
- run: pnpm test:node

ember-try-scenarios:
name: Ember Tests (${{ matrix.test-suite }})
Expand All @@ -86,21 +67,11 @@ jobs:
with:
node-version: 12.x

- name: get yarn cache dir
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
- uses: pnpm/action-setup@v2.0.1
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-ember-try-${{ matrix.test-suite }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: install dependencies
run: yarn install
version: 5.18.9
run_install: true

- name: test
- run: pnpm test:all --skip-cleanup
env:
TEST_SUITE: ${{ matrix.test-suite }}
run: yarn test:all --skip-cleanup
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.travis.yml
bower.json
ember-cli-build.js
pnpm-lock.yaml
RELEASE.md
testem.js
yarn.lock
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ Once the prep work is completed, the actual release is straight forward:
* Next, ensure that you have installed your projects dependencies:

```
yarn install
pnpm install
```

* And last (but not least 😁) do your release:

```
yarn release
pnpm release
```

[release-it](https://github.com/release-it/release-it/) manages the actual
Expand Down
3 changes: 1 addition & 2 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ module.exports = function() {
getChannelURL('canary'),
]).then((urls) => {
return {
useYarn: true,
command: process.env.TEST_SUITE ? `yarn ${process.env.TEST_SUITE}` : 'yarn test',
command: process.env.TEST_SUITE ? `pnpm ${process.env.TEST_SUITE}` : 'pnpm test',
useVersionCompatibility: true,
scenarios: [
{
Expand Down
Loading

0 comments on commit 6c7e153

Please sign in to comment.