Skip to content

Commit cda1d8c

Browse files
Update release-plan (#513)
* Update release-plan * Force re-release
1 parent 23d7da0 commit cda1d8c

File tree

5 files changed

+30
-63
lines changed

5 files changed

+30
-63
lines changed

.github/workflows/plan-release.yml

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- master
78
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/
89
types:
910
- labeled
@@ -14,77 +15,44 @@ concurrency:
1415
cancel-in-progress: true
1516

1617
jobs:
17-
is-this-a-release:
18-
name: "Is this a release?"
18+
should-run-release-plan-prepare:
19+
name: Should we run release-plan prepare?
1920
runs-on: ubuntu-latest
2021
outputs:
21-
command: ${{ steps.check-release.outputs.command }}
22-
22+
should-prepare: ${{ steps.should-prepare.outputs.should-prepare }}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: release-plan/actions/should-prepare-release@v1
2525
with:
26-
fetch-depth: 2
2726
ref: 'main'
28-
# This will only cause the `is-this-a-release` job to have a "command" of `release`
29-
# when the .release-plan.json file was changed on the last commit.
30-
- id: check-release
31-
run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
27+
id: should-prepare
3228

3329
create-prepare-release-pr:
3430
name: Create Prepare Release PR
3531
runs-on: ubuntu-latest
3632
timeout-minutes: 5
37-
needs: is-this-a-release
33+
needs: should-run-release-plan-prepare
3834
permissions:
3935
contents: write
4036
issues: read
4137
pull-requests: write
42-
# only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing)
43-
# only run on labeled event if the PR has already been merged
44-
if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)
45-
38+
if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true'
4639
steps:
47-
- uses: actions/checkout@v4
48-
# We need to download lots of history so that
49-
# github-changelog can discover what's changed since the last release
40+
- uses: release-plan/actions/prepare@v1
41+
name: Run release-plan prepare
5042
with:
51-
fetch-depth: 0
5243
ref: 'main'
53-
- uses: pnpm/action-setup@v4
54-
- uses: actions/setup-node@v4
55-
with:
56-
node-version: 18
57-
cache: pnpm
58-
- run: pnpm install --frozen-lockfile
59-
- name: "Generate Explanation and Prep Changelogs"
60-
id: explanation
61-
run: |
62-
set +e
63-
pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
64-
65-
if [ $? -ne 0 ]; then
66-
release_plan_output=$(cat release-plan-stderr.txt)
67-
else
68-
release_plan_output=$(jq .description .release-plan.json -r)
69-
rm release-plan-stderr.txt
70-
71-
if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then
72-
new_version=$(jq -r '.solution[].newVersion' .release-plan.json)
73-
echo "new_version=v$new_version" >> $GITHUB_OUTPUT
74-
fi
75-
fi
76-
echo 'text<<EOF' >> $GITHUB_OUTPUT
77-
echo "$release_plan_output" >> $GITHUB_OUTPUT
78-
echo 'EOF' >> $GITHUB_OUTPUT
7944
env:
8045
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
46+
id: explanation
8147

82-
- uses: peter-evans/create-pull-request@v7
48+
- uses: peter-evans/create-pull-request@v8
49+
name: Create Prepare Release PR
8350
with:
84-
commit-message: "Prepare Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'"
51+
commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
8552
labels: "internal"
53+
sign-commits: true
8654
branch: release-preview
87-
title: Prepare Release ${{ steps.explanation.outputs.new_version }}
55+
title: Prepare Release ${{ steps.explanation.outputs.new-version }}
8856
body: |
8957
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 👍
9058

.github/workflows/publish.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,20 @@ jobs:
2222
runs-on: ubuntu-latest
2323
permissions:
2424
contents: write
25-
pull-requests: write
2625
id-token: write
2726
attestations: write
2827

2928
steps:
30-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v6
3130
- uses: pnpm/action-setup@v4
32-
- uses: actions/setup-node@v4
31+
- uses: actions/setup-node@v6
3332
with:
34-
node-version: 18
35-
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
33+
node-version: 22
3634
registry-url: 'https://registry.npmjs.org'
3735
cache: pnpm
36+
- run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC
3837
- run: pnpm install --frozen-lockfile
3938
- name: Publish to NPM
4039
run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish
4140
env:
4241
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
43-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.release-plan.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
"pkgJSONPath": "./vertical-collection/package.json"
2323
}
2424
},
25-
"description": "## Release (2026-01-24)\n\n* @html-next/vertical-collection 5.0.0 (major)\n\n#### :boom: Breaking Change\n* `@html-next/vertical-collection`\n * [#511](https://github.com/html-next/vertical-collection/pull/511) V2 Addon Conversion ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#444](https://github.com/html-next/vertical-collection/pull/444) Use co-located components instead of pods ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n* Other\n * [#402](https://github.com/html-next/vertical-collection/pull/402) Ember v3.28.0...v5.2.0 ([@mixonic](https://github.com/mixonic))\n\n#### :bug: Bug Fix\n* `@html-next/vertical-collection`\n * [#479](https://github.com/html-next/vertical-collection/pull/479) Fix for #296: Insert the virtual component bound back to DOM also for the case `shouldRecycle=false` ([@johanrd](https://github.com/johanrd))\n * [#491](https://github.com/html-next/vertical-collection/pull/491) Fix occluded-content height inflation from inherited line-height ([@johanrd](https://github.com/johanrd))\n * [#482](https://github.com/html-next/vertical-collection/pull/482) Add defensive checks for cases where maxHeight is empty string ([@johanrd](https://github.com/johanrd))\n * [#466](https://github.com/html-next/vertical-collection/pull/466) Fix incorrect polling start ([@monovertex](https://github.com/monovertex))\n * [#443](https://github.com/html-next/vertical-collection/pull/443) Remove unneeded peer declaration ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :house: Internal\n* `@html-next/vertical-collection`\n * [#512](https://github.com/html-next/vertical-collection/pull/512) Migrate and fix all ESLint issues. All lint configs are ESM now ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#490](https://github.com/html-next/vertical-collection/pull/490) Move tests to test-app ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#510](https://github.com/html-next/vertical-collection/pull/510) Upgrade some internal deps ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#475](https://github.com/html-next/vertical-collection/pull/475) Convert to gjs ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#459](https://github.com/html-next/vertical-collection/pull/459) Remove V1 Add complexity in the index.js ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#452](https://github.com/html-next/vertical-collection/pull/452) Setup Release plan ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#451](https://github.com/html-next/vertical-collection/pull/451) Configure the prettier commands in package.json ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#441](https://github.com/html-next/vertical-collection/pull/441) Convert to monorepo ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n* Other\n * [#489](https://github.com/html-next/vertical-collection/pull/489) test-app boilerplate ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#438](https://github.com/html-next/vertical-collection/pull/438) Move to pnpm ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#414](https://github.com/html-next/vertical-collection/pull/414) Vertical collection tests compatible with Ember 6 ([@mixonic](https://github.com/mixonic))\n * [#408](https://github.com/html-next/vertical-collection/pull/408) Bump dev Node to v18, reroll lockfile ([@mixonic](https://github.com/mixonic))\n * [#407](https://github.com/html-next/vertical-collection/pull/407) Add dependabot ([@mixonic](https://github.com/mixonic))\n * [#402](https://github.com/html-next/vertical-collection/pull/402) Ember v3.28.0...v5.2.0 ([@mixonic](https://github.com/mixonic))\n\n#### Committers: 4\n- Cosmin Stamate ([@monovertex](https://github.com/monovertex))\n- Matthew Beale ([@mixonic](https://github.com/mixonic))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n- [@johanrd](https://github.com/johanrd)\n"
25+
"description": "## Release (2026-01-24)\n \n* @html-next/vertical-collection 5.0.0 (major)\n\n#### :boom: Breaking Change\n* `@html-next/vertical-collection`\n * [#511](https://github.com/html-next/vertical-collection/pull/511) V2 Addon Conversion ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#444](https://github.com/html-next/vertical-collection/pull/444) Use co-located components instead of pods ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n* Other\n * [#402](https://github.com/html-next/vertical-collection/pull/402) Ember v3.28.0...v5.2.0 ([@mixonic](https://github.com/mixonic))\n\n#### :bug: Bug Fix\n* `@html-next/vertical-collection`\n * [#479](https://github.com/html-next/vertical-collection/pull/479) Fix for #296: Insert the virtual component bound back to DOM also for the case `shouldRecycle=false` ([@johanrd](https://github.com/johanrd))\n * [#491](https://github.com/html-next/vertical-collection/pull/491) Fix occluded-content height inflation from inherited line-height ([@johanrd](https://github.com/johanrd))\n * [#482](https://github.com/html-next/vertical-collection/pull/482) Add defensive checks for cases where maxHeight is empty string ([@johanrd](https://github.com/johanrd))\n * [#466](https://github.com/html-next/vertical-collection/pull/466) Fix incorrect polling start ([@monovertex](https://github.com/monovertex))\n * [#443](https://github.com/html-next/vertical-collection/pull/443) Remove unneeded peer declaration ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :house: Internal\n* `@html-next/vertical-collection`\n * [#512](https://github.com/html-next/vertical-collection/pull/512) Migrate and fix all ESLint issues. All lint configs are ESM now ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#490](https://github.com/html-next/vertical-collection/pull/490) Move tests to test-app ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#510](https://github.com/html-next/vertical-collection/pull/510) Upgrade some internal deps ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#475](https://github.com/html-next/vertical-collection/pull/475) Convert to gjs ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#459](https://github.com/html-next/vertical-collection/pull/459) Remove V1 Add complexity in the index.js ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#452](https://github.com/html-next/vertical-collection/pull/452) Setup Release plan ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#451](https://github.com/html-next/vertical-collection/pull/451) Configure the prettier commands in package.json ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#441](https://github.com/html-next/vertical-collection/pull/441) Convert to monorepo ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n* Other\n * [#489](https://github.com/html-next/vertical-collection/pull/489) test-app boilerplate ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#438](https://github.com/html-next/vertical-collection/pull/438) Move to pnpm ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#414](https://github.com/html-next/vertical-collection/pull/414) Vertical collection tests compatible with Ember 6 ([@mixonic](https://github.com/mixonic))\n * [#408](https://github.com/html-next/vertical-collection/pull/408) Bump dev Node to v18, reroll lockfile ([@mixonic](https://github.com/mixonic))\n * [#407](https://github.com/html-next/vertical-collection/pull/407) Add dependabot ([@mixonic](https://github.com/mixonic))\n * [#402](https://github.com/html-next/vertical-collection/pull/402) Ember v3.28.0...v5.2.0 ([@mixonic](https://github.com/mixonic))\n\n#### Committers: 4\n- Cosmin Stamate ([@monovertex](https://github.com/monovertex))\n- Matthew Beale ([@mixonic](https://github.com/mixonic))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n- [@johanrd](https://github.com/johanrd)\n"
2626
}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"url": "git@github.com:html-next/vertical-collection.git"
88
},
99
"scripts": {
10-
"update:snippets": "node ./scripts/write-snippets.mjs",
1110
"build": "pnpm --filter '*' build",
1211
"lint": "pnpm --filter '*' lint",
1312
"lint:fix": "pnpm --filter '*' lint:fix",
14-
"test:ci": "ls -la ; pnpm --filter '*' test:ci"
13+
"test:ci": "ls -la ; pnpm --filter '*' test:ci",
14+
"update:snippets": "node ./scripts/write-snippets.mjs"
1515
},
1616
"devDependencies": {
17-
"release-plan": "^0.16.0"
17+
"release-plan": "^0.17.4"
1818
},
1919
"packageManager": "pnpm@10.10.0",
2020
"volta": {

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)