diff --git a/.changeset/release-beta-version.md b/.changeset/release-beta-version.md new file mode 100644 index 0000000..093253e --- /dev/null +++ b/.changeset/release-beta-version.md @@ -0,0 +1,9 @@ +--- +"vue-pivottable": patch +"@vue-pivottable/lazy-table-renderer": patch +"@vue-pivottable/plotly-renderer": patch +--- + +chore: 베타 버전 1.1.7-beta.1751886288 릴리즈 + +- develop sync 제거 후 재빌드된 베타 버전 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 262b5f0..627e204 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -201,23 +201,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Sync with develop - if: steps.check-versions.outputs.has_beta == 'true' - run: | - # Configure git - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - # Fetch latest develop - git fetch origin develop:develop - - # Merge release branch into develop - git checkout develop - git merge ${{ steps.create-release.outputs.release_branch }} --no-edit -m "chore: sync release ${{ steps.create-release.outputs.release_branch }} to develop" - git push origin develop - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create PR to main if: steps.check-versions.outputs.has_beta == 'true' run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 32e471d..bab3b73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### Patch Changes +- 15ef3bb: fix: Release 워크플로우에서 develop 동기화 단계 제거 + - main 브랜치에서 stable 릴리즈 후 develop 브랜치와의 동기화 시 발생하는 버전 충돌 문제 해결 + - develop은 항상 베타 버전을 유지하고, main은 stable 버전만 유지하도록 워크플로우 개선 - e38ae7e: chore: 워크플로우 재실행을 위한 changeset - 이전 워크플로우 실행 시 npm 배포 중복 오류 해결을 위함 diff --git a/package.json b/package.json index a7807d8..10d852c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-pivottable", - "version": "1.1.7-beta.1751885610", + "version": "1.1.7-beta.1751886288", "type": "module", "description": "", "exports": { diff --git a/packages/lazy-table-renderer/package.json b/packages/lazy-table-renderer/package.json index fce5824..69d12aa 100644 --- a/packages/lazy-table-renderer/package.json +++ b/packages/lazy-table-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@vue-pivottable/lazy-table-renderer", - "version": "1.1.7-beta.1751885610", + "version": "1.1.7-beta.1751886288", "type": "module", "description": "", "exports": { diff --git a/packages/plotly-renderer/package.json b/packages/plotly-renderer/package.json index 8847efd..d0d03c5 100644 --- a/packages/plotly-renderer/package.json +++ b/packages/plotly-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@vue-pivottable/plotly-renderer", - "version": "2.0.8-beta.1751885610", + "version": "2.0.8-beta.1751886288", "type": "module", "exports": { ".": {