chore: fix preview release bump logic and always publish java (#4973)

Ensure the preview release also bump version to preview version number
instead of staying at the stable release version number.

Example situation today: 0.38.3-beta.1 has version 0.38.2 on all files:
https://github.com/lancedb/lance/blob/v0.38.3-beta.1/Cargo.toml#L25

This should make the version bump experience consistent between lance
and lancedb

Author: jackye1995

.bumpversion.toml

@@ -1,7 +1,10 @@
 [tool.bumpversion]
 current_version = "0.32.1"
-parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
-serialize = ["{major}.{minor}.{patch}"]
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(-(?P<prerelease>.+))?"
+serialize = [
+    "{major}.{minor}.{patch}-{prerelease}",
+    "{major}.{minor}.{patch}"
+]
 search = "{current_version}"
 replace = "{new_version}"
 regex = false

.github/workflows/java-publish.yml

@@ -1,24 +1,23 @@
 name: Build and publish Java packages
 on:
   release:
-    # Use released instead of published, since we don't publish preview/beta
-    # versions
-    types: [released]
+    # Trigger on published to include both stable and preview/beta releases
+    types: [published]
   pull_request:
     paths:
       - .github/workflows/java-publish.yml
   workflow_dispatch:
     inputs:
       mode:
-        description: 'Release mode'
+        description: "Release mode"
         required: true
         type: choice
         default: dry_run
         options:
           - dry_run
           - release
       ref:
-        description: 'The branch, tag or SHA to checkout'
+        description: "The branch, tag or SHA to checkout"
         required: false
         type: string
 
@@ -39,14 +38,14 @@ jobs:
       - name: Build and run in Debian 10 Arm64 container
         run: |
           docker run --platform linux/arm64 -v ${{ github.workspace }}:/workspace -w /workspace debian:10 bash -c "
-            
+
             set -ex
             # Update sources.list to use archive repositories for Debian 10 (EOL)
             echo 'deb http://archive.debian.org/debian/ buster main' > /etc/apt/sources.list
             echo 'deb http://archive.debian.org/debian-security buster/updates main' >> /etc/apt/sources.list
             echo 'deb http://archive.debian.org/debian/ buster-updates main' >> /etc/apt/sources.list
             apt-get update
-          
+
             DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --assume-yes \
               apt-transport-https \
               ca-certificates \
@@ -74,20 +73,20 @@ jobs:
               libhidapi-dev \
               zip \
               unzip
-            
+
             # https://github.com/databendlabs/databend/issues/8035
             PROTOC_ZIP=protoc-3.15.0-linux-aarch_64.zip
             curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.0/\$PROTOC_ZIP
             unzip -o \$PROTOC_ZIP -d /usr/local
             rm -f \$PROTOC_ZIP
             protoc --version
-          
+
             curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
             source \$HOME/.cargo/env
             cargo --version
-            
+
             cd java/lance-jni
-            
+
             # https://github.com/rustls/rustls/issues/1967
             export CC=clang
             export CXX=clang++
@@ -117,14 +116,14 @@ jobs:
       - name: Build and run in Debian 10 X86-64 container
         run: |
           docker run --platform linux/amd64 -v ${{ github.workspace }}:/workspace -w /workspace debian:10 bash -c "
-          
+
             set -ex
             # Update sources.list to use archive repositories for Debian 10 (EOL)
             echo 'deb http://archive.debian.org/debian/ buster main' > /etc/apt/sources.list
             echo 'deb http://archive.debian.org/debian-security buster/updates main' >> /etc/apt/sources.list
             echo 'deb http://archive.debian.org/debian/ buster-updates main' >> /etc/apt/sources.list
             apt-get update
-          
+
             DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --assume-yes \
               apt-transport-https \
               ca-certificates \
@@ -152,20 +151,20 @@ jobs:
               libhidapi-dev \
               zip \
               unzip
-          
+
             # https://github.com/databendlabs/databend/issues/8035
             PROTOC_ZIP=protoc-3.15.0-linux-x86_64.zip
             curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.0/\$PROTOC_ZIP
             unzip -o \$PROTOC_ZIP -d /usr/local
             rm -f \$PROTOC_ZIP
             protoc --version
-          
+
             curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
             source \$HOME/.cargo/env
             cargo --version
-          
+
             cd java/lance-jni
-          
+
             # https://github.com/rustls/rustls/issues/1967
             export CC=clang
             export CXX=clang++
@@ -181,7 +180,7 @@ jobs:
           if-no-files-found: error
   macos-arm64:
     name: Build on MacOS Arm64 and release
-    runs-on: macos-14
+    runs-on: warp-macos-14-arm64-6x
     timeout-minutes: 60
     needs:
       - linux-arm64
@@ -252,4 +251,4 @@ jobs:
       - uses: ./.github/actions/create-failure-issue
         with:
           job-results: ${{ toJSON(needs) }}
-          workflow-name: ${{ github.workflow }}
+          workflow-name: ${{ github.workflow }}

.github/workflows/make-release-commit.yml

@@ -81,30 +81,44 @@ jobs:
       run: |
         CURRENT="${{ steps.current_version.outputs.version }}"
         TYPE="${{ inputs.release_type }}"
-        
-        IFS='.' read -r major minor patch <<< "$CURRENT"
-        
-        case "$TYPE" in
-          major)
-            NEW_VERSION="$((major + 1)).0.0"
-            ;;
-          minor)
-            NEW_VERSION="${major}.$((minor + 1)).0"
-            ;;
-          patch)
-            NEW_VERSION="${major}.${minor}.$((patch + 1))"
-            ;;
-        esac
-        
+        CHANNEL="${{ inputs.release_channel }}"
+
+        # Strip any prerelease suffix to get base version
+        BASE_VERSION=$(echo "$CURRENT" | sed 's/-.*$//')
+        IFS='.' read -r major minor patch <<< "$BASE_VERSION"
+
+        # Determine if we need to bump the base version
+        if [[ "$CHANNEL" == "stable" && "$CURRENT" =~ -beta\. ]]; then
+          # Stable release from beta: use base version without bumping
+          NEW_VERSION="$BASE_VERSION"
+        elif [[ "$CHANNEL" == "preview" && "$CURRENT" =~ -beta\. ]]; then
+          # Preview from preview: keep the same base version, only beta number changes
+          NEW_VERSION="$BASE_VERSION"
+        else
+          # All other cases: bump according to type
+          case "$TYPE" in
+            major)
+              NEW_VERSION="$((major + 1)).0.0"
+              ;;
+            minor)
+              NEW_VERSION="${major}.$((minor + 1)).0"
+              ;;
+            patch)
+              NEW_VERSION="${major}.${minor}.$((patch + 1))"
+              ;;
+          esac
+        fi
+
         echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
         echo "New version will be: $NEW_VERSION"
     
-    - name: Determine tag name
+    - name: Determine tag name and prerelease suffix
       id: tag_name
       run: |
         if [ "${{ inputs.release_channel }}" == "stable" ]; then
           VERSION="${{ steps.new_version.outputs.version }}"
           TAG="v${VERSION}"
+          PRERELEASE=""
         else
           # For preview releases, base the beta tag on the next release version
           VERSION="${{ steps.new_version.outputs.version }}"
@@ -118,26 +132,34 @@ jobs:
             BETA_NUM=$((LAST_NUM + 1))
           fi
           TAG="v${VERSION}-beta.${BETA_NUM}"
+          PRERELEASE="beta.${BETA_NUM}"
         fi
-        
+
         echo "tag=$TAG" >> $GITHUB_OUTPUT
+        echo "prerelease=$PRERELEASE" >> $GITHUB_OUTPUT
         echo "Tag will be: $TAG"
-    
-    - name: Update version (stable releases only)
-      if: inputs.release_channel == 'stable'
+
+    - name: Update version
       run: |
-        python ci/bump_version.py ${{ inputs.release_type }}
+        if [ "${{ inputs.release_channel }}" == "stable" ]; then
+          python ci/bump_version.py --new-version "${{ steps.new_version.outputs.version }}"
+        else
+          python ci/bump_version.py --new-version "${{ steps.new_version.outputs.version }}-${{ steps.tag_name.outputs.prerelease }}"
+        fi
     
     - name: Configure git identity
       run: |
         git config user.name 'Lance Release Bot'
         git config user.email 'lance-dev@lancedb.com'
-    
-    - name: Create release commit (stable releases only)
-      if: inputs.release_channel == 'stable'
+
+    - name: Create release commit
       run: |
         git add -A
-        git commit -m "chore: release version ${{ steps.new_version.outputs.version }}"
+        if [ "${{ inputs.release_channel }}" == "stable" ]; then
+          git commit -m "chore: release version ${{ steps.new_version.outputs.version }}"
+        else
+          git commit -m "chore: release version ${{ steps.tag_name.outputs.tag }}"
+        fi
     
     - name: Create tag
       run: |
@@ -146,11 +168,9 @@ jobs:
     - name: Push changes (if not dry run)
       if: ${{ !inputs.dry_run }}
       run: |
-        if [ "${{ inputs.release_channel }}" == "stable" ]; then
-          # Push the commit for stable releases
-          git push origin main
-        fi
-        # Always push the tag
+        # Push the commit to main
+        git push origin main
+        # Push the tag
         git push origin "${{ steps.tag_name.outputs.tag }}"
     
     - name: Create GitHub Release (if not dry run)
@@ -164,12 +184,14 @@ jobs:
         generate_release_notes: true
         token: ${{ secrets.LANCE_RELEASE_TOKEN }}
 
-    - name: Prepare for next development cycle (stable releases only)
-      if: inputs.release_channel == 'stable' && !inputs.dry_run
+    - name: Next steps
+      if: ${{ !inputs.dry_run }}
       run: |
-        # After a stable release, bump to the next patch version with -dev suffix
-        # This will be handled in a follow-up PR
-        echo "Next steps: Create a PR to bump version for next development cycle"
+        if [ "${{ inputs.release_channel }}" == "stable" ]; then
+          echo "Stable release complete. Version bumped to ${{ steps.new_version.outputs.version }}"
+        else
+          echo "Preview release complete. Version bumped to ${{ steps.new_version.outputs.version }}-${{ steps.tag_name.outputs.prerelease }}"
+        fi
     
     - name: Summary
       run: |

ci/bump_version.py

@@ -35,27 +35,41 @@ def get_current_version() -> str:
     raise ValueError("Could not find version in Cargo.toml")
 
 
-def parse_version(version: str) -> Tuple[int, int, int]:
-    """Parse a version string into major, minor, patch components."""
-    match = re.match(r"(\d+)\.(\d+)\.(\d+)", version)
+def parse_version(version: str) -> Tuple[int, int, int, Optional[str]]:
+    """Parse a version string into major, minor, patch, and optional prerelease components."""
+    match = re.match(r"(\d+)\.(\d+)\.(\d+)(?:-(.+))?", version)
     if not match:
         raise ValueError(f"Invalid version format: {version}")
-    return int(match.group(1)), int(match.group(2)), int(match.group(3))
+    return int(match.group(1)), int(match.group(2)), int(match.group(3)), match.group(4)
 
 
-def bump_version(current: str, bump_type: str) -> str:
-    """Calculate the new version based on bump type."""
-    major, minor, patch = parse_version(current)
-    
+def bump_version(current: str, bump_type: str, prerelease: Optional[str] = None) -> str:
+    """Calculate the new version based on bump type.
+
+    Args:
+        current: Current version string
+        bump_type: Type of bump (major, minor, patch)
+        prerelease: Optional prerelease suffix (e.g., "beta.1")
+
+    Returns:
+        New version string
+    """
+    major, minor, patch, _ = parse_version(current)
+
     if bump_type == "major":
-        return f"{major + 1}.0.0"
+        new_version = f"{major + 1}.0.0"
     elif bump_type == "minor":
-        return f"{major}.{minor + 1}.0"
+        new_version = f"{major}.{minor + 1}.0"
     elif bump_type == "patch":
-        return f"{major}.{minor}.{patch + 1}"
+        new_version = f"{major}.{minor}.{patch + 1}"
     else:
         raise ValueError(f"Invalid bump type: {bump_type}")
 
+    if prerelease:
+        new_version = f"{new_version}-{prerelease}"
+
+    return new_version
+
 
 def update_cargo_lock_files():
     """Update all Cargo.lock files after version change."""
@@ -105,7 +119,20 @@ def main():
     parser.add_argument(
         "bump_type",
         choices=["major", "minor", "patch"],
-        help="Type of version bump to perform"
+        nargs='?',
+        help="Type of version bump to perform (not needed with --new-version)"
+    )
+    parser.add_argument(
+        "--new-version",
+        type=str,
+        default=None,
+        help="Set exact new version (e.g., '0.38.3' or '0.38.3-beta.1')"
+    )
+    parser.add_argument(
+        "--prerelease",
+        type=str,
+        default=None,
+        help="Prerelease suffix (e.g., 'beta.1')"
     )
     parser.add_argument(
         "--dry-run",
@@ -117,12 +144,20 @@ def main():
         action="store_true",
         help="Skip version consistency validation"
     )
-    
+
     args = parser.parse_args()
-    
+
     # Get current version
     current_version = get_current_version()
-    new_version = bump_version(current_version, args.bump_type)
+
+    if args.new_version:
+        # Use exact version provided
+        new_version = args.new_version
+    else:
+        # Calculate new version from bump type
+        if not args.bump_type:
+            parser.error("Either bump_type or --new-version must be provided")
+        new_version = bump_version(current_version, args.bump_type, args.prerelease)
 
     print(f"Current version: {current_version}")
     print(f"New version: {new_version}")