Skip to content

Commit

Permalink
Merge pull request #1251 from adopted-ember-addons/pnpm
Browse files Browse the repository at this point in the history
swap to pnpm
  • Loading branch information
mansona authored Oct 17, 2024
2 parents 6b3af64 + 5d3702d commit ef3ddcd
Show file tree
Hide file tree
Showing 7 changed files with 15,925 additions and 54,294 deletions.
30 changes: 17 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,34 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
cache: pnpm
- name: Install Dependencies
run: npm ci
run: pnpm i --frozen-lockfile
- name: Lint
run: npm run lint
run: pnpm run lint
- name: Run Tests
run: npm run test:ember
run: pnpm run test:ember

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
cache: pnpm
- name: Install Dependencies
run: npm install --no-shrinkwrap
run: pnpm install --no-lockfile
- name: Run Tests
run: npm run test:ember
run: pnpm run test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -60,15 +62,16 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
cache: pnpm
- name: Install Dependencies
run: npm ci
run: pnpm i --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
run: pnpm ember try:one ${{ matrix.try-scenario }}

failing-try-scenarios:
name: ${{ matrix.try-scenario }} Allowed to fail
Expand All @@ -90,16 +93,17 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
cache: pnpm
- name: Install Dependencies
run: npm ci
run: pnpm i --frozen-lockfile
- name: Run Tests
id: tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
run: pnpm ember try:one ${{ matrix.try-scenario }}
continue-on-error: true
- uses: mainmatter/continue-on-error-comment@v1
with:
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use-node-version=18.20.4
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 my-addon`
* `npm install`
* `pnpm install`

## Linting

* `npm run lint`
* `npm run lint:fix`
* `pnpm run lint`
* `pnpm run lint:fix`

## Running tests

Expand Down
1 change: 1 addition & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
usePnpm: true,
scenarios: [
{
name: 'ember-lts-3.20',
Expand Down
Loading

0 comments on commit ef3ddcd

Please sign in to comment.