Skip to content

Commit 0e867e2

Browse files
authored
Merge pull request #112 from emberjs/release-plan-3.x
setup release-plan on 3.x branch
2 parents 10190fa + 3874d37 commit 0e867e2

3 files changed

Lines changed: 20 additions & 19 deletions

File tree

.github/workflows/plan-release.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ name: Release Plan Review
22
on:
33
push:
44
branches:
5-
- main
6-
- master
5+
- 3.x
76
pull_request:
87
types:
98
- labeled
109

1110
concurrency:
12-
group: plan-release # only the latest one of these should ever be running
11+
group: plan-3.x-release # only the latest one of these should ever be running
1312
cancel-in-progress: true
1413

1514
jobs:
@@ -23,14 +22,14 @@ jobs:
2322
- uses: actions/checkout@v4
2423
with:
2524
fetch-depth: 0
26-
ref: 'main'
25+
ref: "3.x"
2726
# This will only cause the `check-plan` job to have a "command" of `release`
2827
# when the .release-plan.json file was changed on the last commit.
2928
- id: check-release
3029
run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
3130

3231
prepare_release_notes:
33-
name: Prepare Release Notes
32+
name: Prepare Release Notes 3.x
3433
runs-on: ubuntu-latest
3534
timeout-minutes: 5
3635
needs: check-plan
@@ -49,21 +48,21 @@ jobs:
4948
# github-changelog can discover what's changed since the last release
5049
with:
5150
fetch-depth: 0
52-
ref: 'main'
51+
ref: "3.x"
5352
- uses: actions/setup-node@v4
5453
with:
5554
node-version: 18
56-
55+
5756
- uses: pnpm/action-setup@v3
5857
- run: pnpm install --frozen-lockfile
59-
58+
6059
- name: "Generate Explanation and Prep Changelogs"
6160
id: explanation
6261
run: |
6362
set +e
64-
63+
6564
pnpm release-plan prepare 2> >(tee -a stderr.log >&2)
66-
65+
6766
6867
if [ $? -ne 0 ]; then
6968
echo 'text<<EOF' >> $GITHUB_OUTPUT
@@ -82,7 +81,7 @@ jobs:
8281
commit-message: "Prepare Release using 'release-plan'"
8382
labels: "internal"
8483
branch: release-preview
85-
title: Prepare Release
84+
title: Prepare Release (3.x)
8685
body: |
8786
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 👍
8887

.github/workflows/publish.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ on:
88
workflow_dispatch:
99
push:
1010
branches:
11-
- main
12-
- master
11+
- 3.x
1312

1413
concurrency:
15-
group: publish-${{ github.head_ref || github.ref }}
14+
group: publish-3.x-${{ github.head_ref || github.ref }}
1615
cancel-in-progress: true
1716

1817
jobs:
@@ -26,7 +25,7 @@ jobs:
2625
- uses: actions/checkout@v4
2726
with:
2827
fetch-depth: 0
29-
ref: 'main'
28+
ref: "3.x"
3029
# This will only cause the `check-plan` job to have a result of `success`
3130
# when the .release-plan.json file was changed on the last commit. This
3231
# plus the fact that this action only runs on main will be enough of a guard
@@ -48,13 +47,13 @@ jobs:
4847
with:
4948
node-version: 18
5049
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
51-
registry-url: 'https://registry.npmjs.org'
52-
50+
registry-url: "https://registry.npmjs.org"
51+
5352
- uses: pnpm/action-setup@v3
5453
- run: pnpm install --frozen-lockfile
5554
- name: npm publish
56-
run: pnpm release-plan publish
57-
55+
run: pnpm release-plan publish --publish-branch=3.x
56+
5857
env:
5958
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
6059
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,8 @@
7777
"volta": {
7878
"node": "18.20.2",
7979
"pnpm": "9.0.6"
80+
},
81+
"release-plan": {
82+
"publishTag": "3-x"
8083
}
8184
}

0 commit comments

Comments
 (0)