Skip to content

Commit d25a5d9

Browse files
Update release-plan to get the latest bugfixes (#407)
1 parent eb62f72 commit d25a5d9

File tree

5 files changed

+52
-45
lines changed

5 files changed

+52
-45
lines changed

.github/workflows/plan-release.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- main
66
- master
77
pull_request:
8-
types:
8+
types:
99
- labeled
1010

1111
concurrency:
@@ -46,35 +46,42 @@ jobs:
4646
steps:
4747
- uses: actions/checkout@v4
4848
# We need to download lots of history so that
49-
# lerna-changelog can discover what's changed since the last release
49+
# github-changelog can discover what's changed since the last release
5050
with:
5151
fetch-depth: 0
52+
ref: 'master'
5253
- uses: actions/setup-node@v4
5354
with:
5455
node-version: 18
5556

56-
- uses: pnpm/action-setup@v2
57+
- uses: pnpm/action-setup@v3
5758
with:
5859
version: 8
5960
- run: pnpm install --frozen-lockfile
6061

6162
- name: "Generate Explanation and Prep Changelogs"
6263
id: explanation
6364
run: |
64-
set -x
65+
set +e
6566
66-
pnpm release-plan prepare
67+
pnpm release-plan prepare 2> >(tee -a stderr.log >&2)
6768
68-
echo 'text<<EOF' >> $GITHUB_OUTPUT
69-
jq .description .release-plan.json -r >> $GITHUB_OUTPUT
70-
echo 'EOF' >> $GITHUB_OUTPUT
69+
70+
if [ $? -ne 0 ]; then
71+
echo 'text<<EOF' >> $GITHUB_OUTPUT
72+
cat stderr.log >> $GITHUB_OUTPUT
73+
echo 'EOF' >> $GITHUB_OUTPUT
74+
else
75+
echo 'text<<EOF' >> $GITHUB_OUTPUT
76+
jq .description .release-plan.json -r >> $GITHUB_OUTPUT
77+
echo 'EOF' >> $GITHUB_OUTPUT
78+
fi
7179
env:
7280
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
7381

74-
- uses: peter-evans/create-pull-request@v5
82+
- uses: peter-evans/create-pull-request@v6
7583
with:
7684
commit-message: "Prepare Release using 'release-plan'"
77-
author: "github-actions[bot] <[email protected]>"
7885
labels: "internal"
7986
branch: release-preview
8087
title: Prepare Release

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# For every push to the master branch, this checks if the release-plan was
22
# updated and if it was it will publish stable npm packages based on the
3-
# release plan
3+
# release plan
44

55
name: Publish Stable
66

@@ -50,7 +50,7 @@ jobs:
5050
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
5151
registry-url: 'https://registry.npmjs.org'
5252

53-
- uses: pnpm/action-setup@v2
53+
- uses: pnpm/action-setup@v3
5454
with:
5555
version: 8
5656
- run: pnpm install --frozen-lockfile

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release Process
22

3-
Releases in this repo are mostly automated using [release-plan](https://github.com/embroider-build/release-plan/). Once you label all your PRs correctly (see below) you will have an automatically generated PR that updates your CHANGELOG.md file and a `.release-plan.json` that is used prepare the release once the PR is merged.
3+
Releases in this repo are mostly automated using [release-plan](https://github.com/embroider-build/release-plan/). Once you label all your PRs correctly (see below) you will have an automatically generated PR that updates your CHANGELOG.md file and a `.release-plan.json` that is used to prepare the release once the PR is merged.
44

55
## Preparation
66

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"concurrently": "^8.2.0",
1919
"prettier": "^3.0.3",
2020
"prettier-plugin-ember-template-tag": "^1.1.0",
21-
"release-plan": "^0.6.0"
21+
"release-plan": "^0.8.0"
2222
},
2323
"pnpm": {
2424
"overrides": {

pnpm-lock.yaml

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)