Skip to content

Commit 3b99d97

Browse files
authored
Merge pull request #203 from vue-pivottable/develop
Release: 1.1.3
2 parents edeb134 + 9ca363c commit 3b99d97

File tree

4 files changed

+42
-12
lines changed

4 files changed

+42
-12
lines changed

.github/workflows/release-develop.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,9 @@ jobs:
100100
Changed packages: $CHANGED_PACKAGES"
101101
git push origin develop
102102
103-
# Use main package version for output (if changed) or first changed package
104-
if [ "$ORIGINAL_MAIN" != "$NEW_MAIN" ]; then
105-
echo "version=${NEW_MAIN}-beta.${TIMESTAMP}" >> $GITHUB_OUTPUT
106-
else
107-
echo "version=beta.${TIMESTAMP}" >> $GITHUB_OUTPUT
108-
fi
103+
# Always use current main package version for GitHub release tag
104+
CURRENT_VERSION=$(node -p "require('./package.json').version")
105+
echo "version=${CURRENT_VERSION}" >> $GITHUB_OUTPUT
109106
110107
- name: Run quality checks
111108
if: steps.changesets-check.outputs.has_changesets == 'true'

.github/workflows/release.yml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,43 @@ jobs:
5454
- name: Check beta versions
5555
id: check-versions
5656
run: |
57-
# Check if packages have beta versions
57+
# Check if any package has beta version
58+
HAS_BETA=false
59+
BETA_PACKAGES=""
60+
61+
# Check main package
5862
MAIN_VERSION=$(node -p "require('./package.json').version")
5963
if [[ $MAIN_VERSION == *"-beta"* ]]; then
60-
echo "has_beta=true" >> $GITHUB_OUTPUT
61-
# Extract base version without beta suffix
64+
HAS_BETA=true
65+
BETA_PACKAGES="vue-pivottable"
66+
# Extract base version without beta suffix for release branch
67+
BASE_VERSION=$(echo $MAIN_VERSION | sed 's/-beta.*//')
68+
echo "base_version=$BASE_VERSION" >> $GITHUB_OUTPUT
69+
fi
70+
71+
# Check sub-packages
72+
for pkg in packages/*/; do
73+
if [ -d "$pkg" ] && [ -f "$pkg/package.json" ]; then
74+
PKG_NAME=$(basename "$pkg")
75+
PKG_VERSION=$(cd "$pkg" && node -p "require('./package.json').version")
76+
if [[ $PKG_VERSION == *"-beta"* ]]; then
77+
HAS_BETA=true
78+
BETA_PACKAGES="$BETA_PACKAGES $PKG_NAME"
79+
fi
80+
fi
81+
done
82+
83+
echo "has_beta=$HAS_BETA" >> $GITHUB_OUTPUT
84+
echo "beta_packages=$BETA_PACKAGES" >> $GITHUB_OUTPUT
85+
86+
# Use main package version for release branch, or highest version
87+
if [ -z "${BASE_VERSION}" ]; then
88+
# If main package is not beta, use its version for release branch
6289
BASE_VERSION=$(echo $MAIN_VERSION | sed 's/-beta.*//')
6390
echo "base_version=$BASE_VERSION" >> $GITHUB_OUTPUT
64-
else
65-
echo "has_beta=false" >> $GITHUB_OUTPUT
6691
fi
92+
93+
echo "Found beta packages: $BETA_PACKAGES"
6794
6895
- name: Update versions to stable
6996
if: steps.check-versions.outputs.has_beta == 'true'

packages/lazy-table-renderer/CHANGELOG.md

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

3+
## 1.1.1
4+
5+
### Patch Changes
6+
7+
- 6c1a31f: test: 워크플로우 수정 테스트
8+
39
## 1.1.0
410

511
### Patch Changes

packages/lazy-table-renderer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue-pivottable/lazy-table-renderer",
3-
"version": "1.1.0",
3+
"version": "1.1.1-beta.1750337280",
44
"type": "module",
55
"description": "",
66
"exports": {

0 commit comments

Comments
 (0)