Skip to content

Commit

Permalink
Merge pull request #188 from ember-cli/pnpm
Browse files Browse the repository at this point in the history
start using pnpm
  • Loading branch information
mansona authored Jun 25, 2024
2 parents 75934f3 + 30bd0fb commit 3b160db
Show file tree
Hide file tree
Showing 7 changed files with 12,918 additions and 26,450 deletions.
72 changes: 31 additions & 41 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,41 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Volta
uses: volta-cli/action@v4
- name: Node Modules Cache
id: cache-npm
uses: actions/cache@v3
uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
path: |
.npm
node_modules/
key: ci-npm-${{ hashFiles('package-lock.json') }}
version: 8
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 16
cache: pnpm
- name: Install Dependencies
if: steps.cache-npm.outputs.cache-hit != 'true'
run: npm ci --cache .npm
run: pnpm i --frozen-lockfile
- name: Lint
run: npm run lint
- name: Run Tests
run: . bin/restore-env.sh && node_modules/.bin/ember test
run: pnpm ember test

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 8

steps:
- uses: actions/checkout@v3
- name: Use Volta
uses: volta-cli/action@v4
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 16
cache: pnpm
- name: Install Dependencies
run: npm i --cache .npm
run: pnpm install --no-lockfile
- name: Run Tests
run: CI=true node_modules/.bin/ember test
run: CI=true pnpm ember test

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand Down Expand Up @@ -79,29 +82,16 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Volta
uses: volta-cli/action@v4
- name: Stash package-lock.json for cache key
run: cp package-lock.json __cache-key
- name: Node Modules Cache
id: cache-npm
uses: actions/cache@v3
uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
path: |
.npm
node_modules/
package.json
package-lock.json
__env
key: ci-npm-v3-${{ matrix.try-scenario }}-${{ hashFiles('config/ember-try.js', '__cache-key') }}
restore-keys: |
ci-npm-${{ hashFiles('package-lock.json') }}
version: 8
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 16
cache: pnpm
- name: Install Dependencies
if: steps.cache-npm.outputs.cache-hit != 'true'
run: npm ci --cache .npm
run: pnpm i --frozen-lockfile
- name: Ember-Try Setup
if: steps.cache-npm.outputs.cache-hit != 'true'
run: node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup --- bin/stash-env.sh
- name: Run Tests
run: . bin/restore-env.sh && CI=true node_modules/.bin/ember test
run: pnpm ember try:one ${{ matrix.try-scenario }}
1 change: 0 additions & 1 deletion bin/restore-env.sh

This file was deleted.

1 change: 0 additions & 1 deletion bin/stash-env.sh

This file was deleted.

Loading

0 comments on commit 3b160db

Please sign in to comment.