Skip to content

use pnpm #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 31 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,43 @@ jobs:
env:
PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
- run: npm ci
- run: npx percy exec -- npm run test:docs
cache: pnpm
- run: pnpm i --frozen-lockfile
- run: pnpm percy exec -- pnpm run test:docs

test:
name: "Tests"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: mansona/npm-lockfile-version@v1
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
- run: npm ci
- run: npm run lint
- run: npx percy exec -- npm run test
cache: pnpm
- run: pnpm i --frozen-lockfile
- run: pnpm run lint
- run: pnpm run test

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

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
- run: npm install --no-shrinkwrap
- run: npm run test:ember
cache: pnpm
- run: pnpm install --no-lockfile
- run: pnpm run test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -73,14 +75,15 @@ jobs:
- no-deprecations

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

allow-fail-try-scenarios:
name: ${{ matrix.try-scenario }} - Allowed to fail
Expand All @@ -97,15 +100,16 @@ jobs:
- ember-release-no-deprecations

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: npm
- run: npm ci
cache: pnpm
- run: pnpm install --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
14 changes: 6 additions & 8 deletions .github/workflows/plan-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ on:
branches:
- main
- master
pull_request:
pull_request_target: # This workflow has permissions on the repo, do NOT run code from PRs in this workflow. See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
types:
- labeled
- unlabeled

concurrency:
group: plan-release # only the latest one of these should ever be running
Expand Down Expand Up @@ -41,7 +42,7 @@ jobs:
explanation: ${{ steps.explanation.outputs.text }}
# only run on push event if plan wasn't updated (don't create a release plan when we're releasing)
# only run on labeled event if the PR has already been merged
if: (github.event_name == 'push' && needs.check-plan.outputs.command != 'release') || (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
if: (github.event_name == 'push' && needs.check-plan.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)

steps:
- uses: actions/checkout@v4
Expand All @@ -53,16 +54,13 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 18

- run: npm ci

- uses: pnpm/action-setup@v4
- run: pnpm install --frozen-lockfile
- name: "Generate Explanation and Prep Changelogs"
id: explanation
run: |
set +e

npx release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)

pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)

if [ $? -ne 0 ]; then
echo 'text<<EOF' >> $GITHUB_OUTPUT
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@ jobs:
node-version: 18
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
registry-url: 'https://registry.npmjs.org'

- run: npm ci
- uses: pnpm/action-setup@v4
- run: pnpm install --frozen-lockfile
- name: npm publish
run: npx release-plan publish

run: pnpm release-plan publish
env:
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
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.28',
Expand Down
Loading
Loading