File tree Expand file tree Collapse file tree 2 files changed +8
-17
lines changed Expand file tree Collapse file tree 2 files changed +8
-17
lines changed Original file line number Diff line number Diff line change 1+ ---
2+ " vue-pivottable " : patch
3+ ---
4+
5+ fix: Release 워크플로우에서 develop 동기화 단계 제거
6+
7+ - main 브랜치에서 stable 릴리즈 후 develop 브랜치와의 동기화 시 발생하는 버전 충돌 문제 해결
8+ - develop은 항상 베타 버전을 유지하고, main은 stable 버전만 유지하도록 워크플로우 개선
Original file line number Diff line number Diff line change @@ -201,23 +201,6 @@ jobs:
201201 env :
202202 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
203203
204- - name : Sync with develop
205- if : steps.check-versions.outputs.has_beta == 'true'
206- run : |
207- # Configure git
208- git config user.name "github-actions[bot]"
209- git config user.email "github-actions[bot]@users.noreply.github.com"
210-
211- # Fetch latest develop
212- git fetch origin develop:develop
213-
214- # Merge release branch into develop
215- git checkout develop
216- git merge ${{ steps.create-release.outputs.release_branch }} --no-edit -m "chore: sync release ${{ steps.create-release.outputs.release_branch }} to develop"
217- git push origin develop
218- env :
219- GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
220-
221204 - name : Create PR to main
222205 if : steps.check-versions.outputs.has_beta == 'true'
223206 run : |
You can’t perform that action at this time.
0 commit comments