Skip to content

Commit

Permalink
Merge pull request #773 from adopted-ember-addons/pnpm-pt2
Browse files Browse the repository at this point in the history
Migrate to pnpm part 2
  • Loading branch information
SergeAstapov committed Mar 15, 2024
2 parents bab34e6 + 00326e1 commit 7e4ea81
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
node-version: 18
cache: pnpm
- run: pnpm install --frozen-lockfile
- run: pnpm deploy
- run: pnpm run deploy
working-directory: docs
- run: git push origin
7 changes: 5 additions & 2 deletions .github/workflows/plan-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,17 @@ jobs:
with:
node-version: 18

- run: npm ci
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm install --frozen-lockfile

- name: "Generate Explanation and Prep Changelogs"
id: explanation
run: |
set +e
npx release-plan prepare 2> >(tee -a stderr.log >&2)
pnpm release-plan prepare 2> >(tee -a stderr.log >&2)
if [ $? -ne 0 ]; then
Expand Down
43 changes: 0 additions & 43 deletions .github/workflows/publish-unstable.yml

This file was deleted.

7 changes: 5 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,12 @@ jobs:
# 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@v3
with:
version: 8
- run: pnpm install --frozen-lockfile
- name: npm publish
run: npx release-plan publish
run: pnpm release-plan publish

env:
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Because this library needs to be built,
# we can't easily point package.json files at the git repo for easy cross-repo testing.
#
# This workflow brings back that capability by placing the compiled assets on a "dist" branch
# (configurable via the "branch" option below)
name: Push dist

on:
push:
branches:
- main
- master

jobs:
push-dist:
name: Push dist
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- uses: kategengler/[email protected]
with:
branch: dist
token: ${{ secrets.GITHUB_TOKEN }}
working-directory: addon

0 comments on commit 7e4ea81

Please sign in to comment.