Skip to content

Commit 73db667

Browse files
committed
Merge branch 'release/next'
2 parents 21af3f1 + 3970396 commit 73db667

File tree

4 files changed

+10
-38
lines changed

4 files changed

+10
-38
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: CI
33
on:
44
pull_request:
55
branches: [develop, main]
6-
push:
7-
branches: [main]
86
workflow_call: {}
97

108
concurrency:

.github/workflows/release-prepare.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
git status --porcelain
5151
fi
5252
53-
- name: Commit version & changelog changes into prep branch
53+
- name: Commit version & changelog directly into release branch
5454
if: steps.changes.outputs.has_changes == 'true'
5555
uses: stefanzweifel/git-auto-commit-action@v5
5656
env:
@@ -59,39 +59,7 @@ jobs:
5959
commit_message: "chore: version packages (prepare release)"
6060
commit_user_name: github-actions[bot]
6161
commit_user_email: 41898282+github-actions[bot]@users.noreply.github.com
62-
branch: changeset/prepare-${{ github.ref_name }}
63-
create_branch: true
62+
branch: ${{ github.ref_name }}
63+
create_branch: false
6464
push_options: --force-with-lease
6565

66-
- name: Open or update PR to release branch
67-
if: steps.changes.outputs.has_changes == 'true'
68-
uses: actions/github-script@v7
69-
with:
70-
script: |
71-
const { owner, repo } = context.repo;
72-
const releaseBranch = context.ref.replace('refs/heads/', '');
73-
const headBranch = `changeset/prepare-${releaseBranch}`;
74-
const base = releaseBranch;
75-
const title = 'chore: release (prepared by Changesets)';
76-
const body = 'This PR was automatically created by release-prepare workflow. It contains version bumps and CHANGELOG updates generated by Changesets.';
77-
78-
const existing = await github.rest.pulls.list({ owner, repo, state: 'open', head: `${owner}:${headBranch}`, base });
79-
if (existing.data.length > 0) {
80-
const pr = existing.data[0];
81-
await github.rest.pulls.update({ owner, repo, pull_number: pr.number, title, body });
82-
core.info(`Updated PR #${pr.number}: ${pr.html_url}`);
83-
return;
84-
}
85-
86-
try {
87-
const cmp = await github.rest.repos.compareCommits({ owner, repo, base, head: headBranch });
88-
if (!cmp.data.ahead_by) {
89-
core.info(`No commits ahead in ${headBranch} vs ${base}. Skipping PR creation.`);
90-
return;
91-
}
92-
} catch (e) {
93-
core.info(`compareCommits failed: ${e.message}`);
94-
}
95-
96-
const pr = await github.rest.pulls.create({ owner, repo, head: headBranch, base, title, body });
97-
core.info(`Created PR #${pr.data.number}: ${pr.data.html_url}`);

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @addon-core/storage
22

3+
## 0.1.6
4+
5+
### Patch Changes
6+
7+
- [`0365825`](https://github.com/addon-stack/storage/commit/0365825edde15539e507b0fc5c115d19afe9380e) Thanks [@addon-stack](https://github.com/addon-stack)! - simplify release workflow by committing changes directly to release branch
8+
39
## 0.1.5
410

511
### Patch Changes

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@addon-core/storage",
3-
"version": "0.1.5",
3+
"version": "0.1.6",
44
"type": "module",
55
"license": "MIT",
66
"repository": {

0 commit comments

Comments
 (0)