Skip to content

Commit 612f2ce

Browse files
authored
Merge pull request #105 from vue-pivottable/main-to-release
chore: sync main to release
2 parents 9d3b50b + 69290ee commit 612f2ce

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

.github/workflows/create-release-pr.yml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,23 @@ jobs:
1313
pull-requests: write
1414

1515
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1817
with:
19-
fetch-depth: 0
20-
token: ${{ secrets.GITHUB_TOKEN }}
18+
ref: release
2119

22-
- name: Generate GitHub App Token
23-
id: generate-token
24-
uses: tibdex/github-app-token@v1
25-
with:
26-
app_id: ${{ secrets.APP_ID }}
27-
private_key: ${{ secrets.APP_PRIVATE_KEY }}
28-
installation_id: ${{ secrets.APP_INSTALLATION_ID }}
20+
- name: Reset main branch
21+
run: |
22+
git fetch origin main:main
23+
git reset --hard main
2924
3025
- name: Create Pull Request
31-
uses: peter-evans/create-pull-request@v5
26+
uses: peter-evans/create-pull-request@v7
3227
with:
33-
token: ${{ steps.generate-token.outputs.token }}
34-
base: main
35-
branch: release
28+
branch: main-to-release
29+
commit-message: 'chore: sync main to release'
3630
title: 'chore: sync main to release'
3731
body: |
38-
이 PR은 메인 브랜치의 변경사항을 릴리즈 브랜치로 동기화합니다.
32+
이 PR은 main 브랜치의 변경사항을 release 브랜치로 동기화합니다.
3933
40-
이 PR이 머지되면 릴리즈 워크플로우가 자동으로 트리거됩니다.
41-
labels: |
42-
automated-pr
43-
sync-to-release
34+
이 PR이 머지되면 release 워크플로우가 자동으로 트리거됩니다.
35+
delete-branch: true

.github/workflows/release-lazy-table-renderer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
uses: peter-evans/create-pull-request@v5
6060
with:
6161
token: ${{ secrets.GITHUB_TOKEN }}
62-
branch: release
63-
base: main
62+
branch: main
63+
base: release
6464
title: 'chore: update version to latest release'
6565
body: |
6666
This PR updates the main branch with the latest version information from the release branch.

.github/workflows/release-vue-pivottable.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
id-token: write
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121

@@ -50,18 +50,26 @@ jobs:
5050
run: |
5151
pnpm dlx semantic-release
5252
53-
- name: Create Pull Request to main
53+
- uses: actions/checkout@v4
54+
with:
55+
ref: main
56+
57+
- name: Reset main branch
58+
run: |
59+
git fetch origin release:release
60+
git reset --hard release
61+
- name: Create Pull Request
5462
if: success()
5563
uses: peter-evans/create-pull-request@v5
5664
with:
57-
token: ${{ secrets.GITHUB_TOKEN }}
58-
branch: release
59-
base: main
65+
branch: release-to-main
66+
commit-message: 'chore: update version to latest release'
6067
title: 'chore: update version to latest release'
6168
body: |
62-
This PR updates the main branch with the latest version information from the release branch.
69+
이 PR은 release 브랜치의 최신 버전 정보로 main 브랜치를 업데이트합니다.
6370
64-
- Updates package.json version
65-
- Updates CHANGELOG.md
71+
- package.json 버전 업데이트
72+
- CHANGELOG.md 업데이트
6673
67-
This PR was automatically created by the release workflow.
74+
이 PR은 release 워크플로우에 의해 자동으로 생성되었습니다.
75+
delete-branch: true

0 commit comments

Comments
 (0)