ci: fix beta release (#14)

jackye1995 · web-flow · commit 3bcb33a871e9 · 2026-01-28T23:56:40.000-08:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,14 +48,19 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     outputs:
-      tag: ${{ steps.tag_name.outputs.tag }}
-      version: ${{ steps.new_version.outputs.version }}
+      tag: ${{ steps.versions.outputs.tag }}
+      version: ${{ steps.versions.outputs.pkg_version }}
     steps:
     - name: Output Inputs
       run: echo "${{ toJSON(github.event.inputs) }}"
 
     - name: Checkout repo
       uses: actions/checkout@v4
+      with:
+        ref: main
+        token: ${{ secrets.LANCE_RELEASE_TOKEN }}
+        fetch-depth: 0
+
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
@@ -77,83 +82,105 @@ jobs:
         CURRENT_VERSION=$(python -c "import toml; print(toml.load('.bumpversion.toml')['tool']['bumpversion']['current_version'])")
         echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
         echo "Current version: $CURRENT_VERSION"
-    - name: Calculate new version
-      id: new_version
+    - name: Calculate base version
+      id: base_version
       run: |
         python ci/calculate_version.py \
           --current "${{ steps.current_version.outputs.version }}" \
           --type "${{ inputs.release_type }}" \
           --channel "${{ inputs.release_channel }}"
-    - name: Determine tag name
-      id: tag_name
+
+    - name: Determine tag and package version
+      id: versions
       run: |
+        BASE_VERSION="${{ steps.base_version.outputs.version }}"
+        CURRENT_VERSION="${{ steps.current_version.outputs.version }}"
         if [ "${{ inputs.release_channel }}" == "stable" ]; then
-          VERSION="${{ steps.new_version.outputs.version }}"
-          TAG="v${VERSION}"
+          TAG="v${BASE_VERSION}"
+          PKG_VERSION="${BASE_VERSION}"
         else
-          # For preview releases, use current version with beta suffix
-          VERSION="${{ steps.current_version.outputs.version }}"
-          # Find the next beta number for current version
-          BETA_TAGS=$(git tag -l "v${VERSION}-beta.*" | sort -V)
+          # For preview releases, find the next beta number for this base version
+          BETA_TAGS=$(git tag -l "v${BASE_VERSION}-beta.*" | sort -V)
           if [ -z "$BETA_TAGS" ]; then
             BETA_NUM=1
           else
             LAST_BETA=$(echo "$BETA_TAGS" | tail -n 1)
-            LAST_NUM=$(echo "$LAST_BETA" | sed "s/v${VERSION}-beta.//")
+            LAST_NUM=$(echo "$LAST_BETA" | sed "s/v${BASE_VERSION}-beta.//")
             BETA_NUM=$((LAST_NUM + 1))
           fi
-          TAG="v${VERSION}-beta.${BETA_NUM}"
+          TAG="v${BASE_VERSION}-beta.${BETA_NUM}"
+          # For preview releases, package version should include the beta suffix
+          PKG_VERSION="${BASE_VERSION}-beta.${BETA_NUM}"
+        fi
+
+        # Check if version actually changes (needed for commit/push decisions)
+        if [ "$CURRENT_VERSION" != "$PKG_VERSION" ]; then
+          VERSION_CHANGED="true"
+        else
+          VERSION_CHANGED="false"
         fi
 
         echo "tag=$TAG" >> $GITHUB_OUTPUT
+        echo "pkg_version=$PKG_VERSION" >> $GITHUB_OUTPUT
+        echo "version_changed=$VERSION_CHANGED" >> $GITHUB_OUTPUT
         echo "Tag will be: $TAG"
+        echo "Package version will be: $PKG_VERSION"
+        echo "Version changed: $VERSION_CHANGED"
     - name: Configure git identity
       run: |
         git config user.name 'Lance Release Bot'
         git config user.email 'dev+gha@lance.org'
-    - name: Update version (stable releases only)
-      if: inputs.release_channel == 'stable'
+    - name: Update version (when version changes)
+      if: steps.versions.outputs.version_changed == 'true'
       run: |
-        python ci/bump_version.py --version "${{ steps.new_version.outputs.version }}"
+        python ci/bump_version.py --version "${{ steps.versions.outputs.pkg_version }}"
         git diff
-    - name: Create release commit (stable releases only)
-      if: inputs.release_channel == 'stable'
+
+    - name: Create release commit (when version changes)
+      if: steps.versions.outputs.version_changed == 'true'
       run: |
         git add -A
-        git commit -m "chore: release version ${{ steps.new_version.outputs.version }}" || echo "No changes to commit"
+        git commit -m "chore: bump version to ${{ steps.versions.outputs.pkg_version }}" || echo "No changes to commit"
+
     - name: Create tag
       run: |
-        git tag -a "${{ steps.tag_name.outputs.tag }}" -m "Release ${{ steps.tag_name.outputs.tag }}"
+        git tag -a "${{ steps.versions.outputs.tag }}" -m "Release ${{ steps.versions.outputs.tag }}"
+
     - name: Push changes (if not dry run)
       if: ${{ !inputs.dry_run }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.LANCE_RELEASE_TOKEN }}
       run: |
-        if [ "${{ inputs.release_channel }}" == "stable" ]; then
-          # Push the commit for stable releases
+        # Configure git to use the token for authentication
+        git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git"
+
+        if [ "${{ steps.versions.outputs.version_changed }}" == "true" ]; then
+          # Push the version bump commit
           git push origin main
         fi
         # Always push the tag
-        git push origin "${{ steps.tag_name.outputs.tag }}"
+        git push origin "${{ steps.versions.outputs.tag }}"
     - name: Create GitHub Release Draft (if not dry run)
       if: ${{ !inputs.dry_run }}
       uses: softprops/action-gh-release@v2
       with:
-        tag_name: ${{ steps.tag_name.outputs.tag }}
-        name: ${{ steps.tag_name.outputs.tag }}
+        tag_name: ${{ steps.versions.outputs.tag }}
+        name: ${{ steps.versions.outputs.tag }}
         generate_release_notes: true
         draft: true
         prerelease: ${{ inputs.release_channel == 'preview' }}
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.LANCE_RELEASE_TOKEN }}
     - name: Summary
       run: |
         echo "## Release Summary" >> $GITHUB_STEP_SUMMARY
         echo "" >> $GITHUB_STEP_SUMMARY
         echo "- **Release Type:** ${{ inputs.release_type }}" >> $GITHUB_STEP_SUMMARY
         echo "- **Release Channel:** ${{ inputs.release_channel }}" >> $GITHUB_STEP_SUMMARY
         echo "- **Current Version:** ${{ steps.current_version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
-        if [ "${{ inputs.release_channel }}" == "stable" ]; then
-          echo "- **New Version:** ${{ steps.new_version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+        if [ "${{ steps.versions.outputs.version_changed }}" == "true" ]; then
+          echo "- **New Version:** ${{ steps.versions.outputs.pkg_version }}" >> $GITHUB_STEP_SUMMARY
         fi
-        echo "- **Tag:** ${{ steps.tag_name.outputs.tag }}" >> $GITHUB_STEP_SUMMARY
+        echo "- **Tag:** ${{ steps.versions.outputs.tag }}" >> $GITHUB_STEP_SUMMARY
         echo "- **Dry Run:** ${{ inputs.dry_run }}" >> $GITHUB_STEP_SUMMARY
 
         if [ "${{ inputs.dry_run }}" == "true" ]; then
@@ -172,6 +199,6 @@ jobs:
             echo "   - Trigger automatic publishing to Maven Central and PyPI" >> $GITHUB_STEP_SUMMARY
           else
             echo "   - Create a preview/beta release" >> $GITHUB_STEP_SUMMARY
-            echo "   - Note: Preview releases are not published to package repositories" >> $GITHUB_STEP_SUMMARY
+            echo "   - Trigger automatic publishing to Maven Central and PyPI (as pre-release version)" >> $GITHUB_STEP_SUMMARY
           fi
         fi
diff --git a/ci/calculate_version.py b/ci/calculate_version.py
@@ -27,21 +27,22 @@ def calculate_next_version(current_version, release_type, channel):
         minor = int(parts[1]) if len(parts) > 1 else 0
         patch = int(parts[2]) if len(parts) > 2 else 0
 
-    # Calculate new version for stable releases
-    if channel == "stable":
-        if release_type == "major":
-            new_version = f"{major + 1}.0.0"
-        elif release_type == "minor":
-            new_version = f"{major}.{minor + 1}.0"
-        elif release_type == "patch":
-            new_version = f"{major}.{minor}.{patch + 1}"
-        elif release_type == "current":
-            new_version = f"{major}.{minor}.{patch}"
-        else:
-            raise ValueError(f"Unknown release type: {release_type}")
-    else:
-        # For preview releases, keep the current version
+    # Calculate new version based on release type
+    # Note: 'current' keeps the same version (used to finalize previews to stable)
+    if release_type == "major":
+        new_version = f"{major + 1}.0.0"
+    elif release_type == "minor":
+        new_version = f"{major}.{minor + 1}.0"
+    elif release_type == "patch":
+        new_version = f"{major}.{minor}.{patch + 1}"
+    elif release_type == "current":
+        # Keep current base version - used for:
+        # - Subsequent preview releases (v0.1.0-beta.2, beta.3, etc.)
+        # - Finalizing preview to stable (v0.1.0-beta.X -> v0.1.0)
+        # Strip any pre-release suffix to get base version
         new_version = f"{major}.{minor}.{patch}"
+    else:
+        raise ValueError(f"Unknown release type: {release_type}")
 
     return new_version
 
