Skip to content

Commit

Permalink
Merge pull request #128 from mansona/pnpm
Browse files Browse the repository at this point in the history
use pnpm
  • Loading branch information
lukemelia authored Mar 11, 2024
2 parents 6df916a + f714462 commit b789d95
Show file tree
Hide file tree
Showing 9 changed files with 11,983 additions and 12,902 deletions.
27 changes: 18 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v3
with:
version: 7
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14.x
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Lint
run: yarn lint
run: pnpm lint
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

floating:
name: "Floating Dependencies"
Expand All @@ -38,14 +41,17 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v3
with:
version: 7
- uses: actions/setup-node@v3
with:
node-version: 14.x
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --no-lockfile
run: pnpm install --no-lockfile
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -67,12 +73,15 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v3
with:
version: 7
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14.x
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
use-node-version=14.21.1
auto-install-peers=false
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

* `git clone <repository-url>`
* `cd ember-tether`
* `yarn install`
* `pnpm install`

## Linting

* `yarn lint`
* `yarn lint:fix`
* `pnpm lint`
* `pnpm lint:fix`

## Running tests

Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
* First, ensure that you have installed your projects dependencies:

```sh
yarn install
pnpm install
```

* Second, ensure that you have obtained a
Expand Down
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"ember-source": "~4.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2",
"ember-try": "^2.0.0",
"ember-try": "^3.0.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
Expand Down Expand Up @@ -108,9 +108,5 @@
"release": true,
"tokenRef": "GITHUB_AUTH"
}
},
"volta": {
"node": "14.21.1",
"yarn": "1.22.19"
}
}
Loading

0 comments on commit b789d95

Please sign in to comment.