Skip to content

Commit

Permalink
Merge pull request #1533 from emberjs/make-release-plan-work-fro-v3
Browse files Browse the repository at this point in the history
Make release-plan work for v3
  • Loading branch information
mansona authored Jan 31, 2025
2 parents 44be785 + 2034fb7 commit be037dc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/plan-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ name: Release Plan Review
on:
push:
branches:
- main
- master
- v3.x
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
group: plan-release-v3 # only the latest one of these should ever be running
cancel-in-progress: true

jobs:
Expand All @@ -24,7 +23,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: 'master'
ref: 'v3.x'
# This will only cause the `check-plan` job to have a "command" of `release`
# when the .release-plan.json file was changed on the last commit.
- id: check-release
Expand All @@ -50,7 +49,7 @@ jobs:
# github-changelog can discover what's changed since the last release
with:
fetch-depth: 0
ref: 'master'
ref: 'v3.x'
- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down Expand Up @@ -79,7 +78,7 @@ jobs:
with:
commit-message: "Prepare Release using 'release-plan'"
labels: "internal"
branch: release-preview
branch: release-preview-v3
title: Prepare Release
body: |
This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ on:
workflow_dispatch:
push:
branches:
- main
- master
- v3.x

concurrency:
group: publish-${{ github.head_ref || github.ref }}
group: publish-v3-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
Expand All @@ -26,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: 'master'
ref: 'v3.x'
# This will only cause the `check-plan` job to have a result of `success`
# when the .release-plan.json file was changed on the last commit. This
# plus the fact that this action only runs on main will be enough of a guard
Expand All @@ -52,7 +51,7 @@ jobs:
- uses: pnpm/action-setup@v4
- run: pnpm install --frozen-lockfile
- name: npm publish
run: pnpm release-plan publish
run: pnpm release-plan publish --publish-branch v3.x --tag legacy-v3
env:
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

0 comments on commit be037dc

Please sign in to comment.