@@ -46,14 +46,19 @@ jobs:
4646 fi
4747
4848 - name : Version packages as beta
49+ id : version
4950 if : steps.changesets-check.outputs.has_changesets == 'true'
5051 run : |
5152 # Apply changesets and consume them
5253 pnpm changeset version
5354
5455 # Update to beta versions
5556 MAIN_VERSION=$(node -p "require('./package.json').version")
56- BETA_VERSION="${MAIN_VERSION}-beta.$(date +%s)"
57+ TIMESTAMP=$(date +%s)
58+
59+ # Remove ALL existing beta suffixes if present and add new one
60+ CLEAN_VERSION=$(echo "$MAIN_VERSION" | sed 's/-beta\.[0-9]*//g')
61+ BETA_VERSION="${CLEAN_VERSION}-beta.${TIMESTAMP}"
5762
5863 # Update main package
5964 npm version $BETA_VERSION --no-git-tag-version
6368 if [ -d "$pkg" ] && [ -f "$pkg/package.json" ]; then
6469 cd "$pkg"
6570 PKG_VERSION=$(node -p "require('./package.json').version")
66- PKG_BETA="${PKG_VERSION}-beta.$(date +%s)"
71+ # Remove ALL existing beta suffixes if present and add new one
72+ PKG_CLEAN=$(echo "$PKG_VERSION" | sed 's/-beta\.[0-9]*//g')
73+ PKG_BETA="${PKG_CLEAN}-beta.${TIMESTAMP}"
6774 npm version $PKG_BETA --no-git-tag-version
6875 cd -
6976 fi
@@ -95,24 +102,15 @@ jobs:
95102 echo "Building all packages..."
96103 pnpm build:all
97104
98- - name : Publish pre-release to npm
99- if : steps.changesets-check.outputs.has_changesets == 'true'
100- run : |
101- # Publish with beta tag
102- node scripts/release-packages-beta.js
103- env :
104- NODE_AUTH_TOKEN : ${{ secrets.NPM_TOKEN }}
105- NPM_TOKEN : ${{ secrets.NPM_TOKEN }}
106- NPM_TOKEN_SUMIN : ${{ secrets.NPM_TOKEN_SUMIN }}
107-
108105 - name : Create GitHub Pre-release
109106 if : steps.changesets-check.outputs.has_changesets == 'true'
107+ id : create-release
110108 uses : actions/create-release@v1
111109 env :
112110 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
113111 with :
114- tag_name : v ${{ steps.version.outputs.version }}
115- release_name : v ${{ steps.version.outputs.version }}
112+ tag_name : vue-pivottable@ ${{ steps.version.outputs.version }}
113+ release_name : vue-pivottable@ ${{ steps.version.outputs.version }}
116114 draft : false
117115 prerelease : true
118116 body : |
@@ -121,6 +119,18 @@ jobs:
121119 This is a pre-release version. It may contain bugs and breaking changes.
122120
123121 Install with: `npm install vue-pivottable@beta`
122+
123+ ### Version: ${{ steps.version.outputs.version }}
124+
125+ - name : Publish pre-release to npm
126+ if : steps.changesets-check.outputs.has_changesets == 'true' && steps.create-release.outcome == 'success'
127+ run : |
128+ # Publish with beta tag only after GitHub release is created
129+ node scripts/release-packages-beta.js
130+ env :
131+ NODE_AUTH_TOKEN : ${{ secrets.NPM_TOKEN }}
132+ NPM_TOKEN : ${{ secrets.NPM_TOKEN }}
133+ NPM_TOKEN_SUMIN : ${{ secrets.NPM_TOKEN_SUMIN }}
124134
125135 - name : Create or Update PR to main
126136 if : steps.changesets-check.outputs.has_changesets == 'true'
0 commit comments