fix version as part of CI (#216)

Co-authored-by: CI Builder <[email protected]>

Author: shanthoosh

.github/workflows/java-ci.yml

@@ -57,7 +57,7 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
-  build:
+  build-checks:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -67,17 +67,50 @@ jobs:
       with:
         distribution: zulu
         java-version: 8
-    - run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
+    - run: ./gradlew -DsparkVersions=3.5 build -x test -x javadoc -x integrationTest
 
-    - name: Perform release
-      if: ${{ github.event_name == 'push'
-        && github.ref == 'refs/heads/openhouse-1.5.2'
-        && github.repository == 'linkedin/iceberg'
-        && !contains(toJSON(github.event.commits.*.message), '[skip release]') }}
-      run: ./gradlew -DsparkVersions=3.5 githubRelease publishToSonatype closeAndReleaseStagingRepository -x test -x integrationTest
-      env:
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        SONATYPE_USER: ${{secrets.SONATYPE_USERNAME}}
-        SONATYPE_PWD: ${{secrets.SONATYPE_PASSWORD}}
-        PGP_KEY: ${{secrets.PGP_KEY}}
-        PGP_PWD: ${{secrets.PGP_PWD}}
+  release:
+    needs: build-checks
+    if: ${{ github.event_name == 'push' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # REQUIRED for git describe to find tags
+      - uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 8
+      - run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
+
+      - name: Build for release
+        run: ./gradlew -DsparkVersions=3.5 build -x test -x integrationTest
+
+      - name: Create and push version tag
+        id: create_tag
+        if: ${{ github.event_name == 'push'
+          && github.ref == 'refs/heads/openhouse-1.5.2'
+          && github.repository == 'linkedin/iceberg'
+          && !contains(toJSON(github.event.commits.*.message), '[skip release]') }}
+        run: ./ci-create-tag.sh
+        env:
+          GIT_USER_NAME: "GitHub Actions"
+          GIT_USER_EMAIL: "[email protected]"
+
+      - name: Perform release
+        if: ${{ github.event_name == 'push'
+          && github.ref == 'refs/heads/openhouse-1.5.2'
+          && github.repository == 'linkedin/iceberg'
+          && !contains(toJSON(github.event.commits.*.message), '[skip release]') }}
+        run: |
+          echo "Using version: ${{ steps.create_tag.outputs.NEW_VERSION }}"
+          ./gradlew githubRelease publishToSonatype closeAndReleaseStagingRepository \
+            -PciVersion="${{ steps.create_tag.outputs.NEW_VERSION }}" \
+            -DsparkVersions=3.5 \
+            -x test -x integrationTest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONATYPE_USER: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PWD: ${{secrets.SONATYPE_PASSWORD}}
+          PGP_KEY: ${{secrets.PGP_KEY}}
+          PGP_PWD: ${{secrets.PGP_PWD}}

build.gradle

@@ -17,9 +17,8 @@
  * under the License.
  */
 
+
 import groovy.transform.Memoized
-import java.util.regex.Matcher
-import java.util.regex.Pattern
 
 buildscript {
   repositories {
@@ -982,23 +981,31 @@ String getVersionFromFile() {
 }
 
 String getProjectVersion() {
-  if (versionFileExists()) {
-    return getVersionFromFile()
+  // Check if CI has provided an explicit version via -PciVersion
+  if (project.hasProperty('ciVersion')) {
+    String version = project.property('ciVersion')
+    println "Version from CI:          ${version.padRight(27)}"
+    return version
   }
 
   try {
-    // we're fetching the version from the latest tag (prefixed with 'apache-iceberg-'),
-    // which can look like this: '0.13.0-2-g805400f0.dirty' but we're only interested in the MAJOR.MINOR.PATCH part
-    String version = gitVersion()
-    Pattern pattern = Pattern.compile("^([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)?\$")
-    Matcher matcher = pattern.matcher(version)
-    if (matcher.matches()) {
-      // bump the MINOR version and always set the PATCH version to 0
-      return matcher.group(1) + "." + (Integer.valueOf(matcher.group(2)) + 1) + ".0-SNAPSHOT"
+    def stdout = new ByteArrayOutputStream()
+    exec {
+      commandLine 'git', 'describe', '--tags', '--abbrev=0'
+      standardOutput = stdout
+    }
+    String version = stdout.toString().trim()
+    
+    // Remove 'v' prefix if present
+    if (version.startsWith('v')) {
+      version = version.substring(1)
     }
+    
+    println "Version from git tag:     ${version.padRight(30)}"
     return version
   } catch (Exception e) {
-    throw new Exception("Neither version.txt nor git version exists: " + e.getMessage(), e)
+    logger.warn("Could not determine version from git: ${e.message}")
+    return "0.0.0-SNAPSHOT"
   }
 }
 

ci-create-tag.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -euo pipefail
+
+echo "Fetching tags to ensure we have the latest..."
+git fetch --tags
+
+CURRENT_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0.0")
+echo "Current tag: $CURRENT_TAG"
+
+# Normalize version (remove 'v' prefix if present)
+VERSION=${CURRENT_TAG#v}
+echo "Normalized version: $VERSION"
+
+# Split version into parts (expecting MAJOR.MINOR.PATCH.BUILD)
+IFS='.' read -ra VERSION_PARTS <<< "$VERSION"
+
+# Ensure we have 4 parts, pad with zeros if needed
+while [ ${#VERSION_PARTS[@]} -lt 4 ]; do
+  VERSION_PARTS+=(0)
+done
+
+MAJOR=${VERSION_PARTS[0]}
+MINOR=${VERSION_PARTS[1]}
+PATCH=${VERSION_PARTS[2]}
+BUILD=${VERSION_PARTS[3]}
+
+# Increment build number
+BUILD=$((BUILD + 1))
+
+NEW_VERSION="$MAJOR.$MINOR.$PATCH.$BUILD"
+NEW_TAG="v$NEW_VERSION"
+
+echo "New version: $NEW_VERSION"
+echo "New tag: $NEW_TAG"
+
+# Check if tag already exists
+if git rev-parse "$NEW_TAG" >/dev/null 2>&1; then
+  echo "Tag $NEW_TAG already exists. Skipping tag creation."
+  echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
+  exit 0
+fi
+
+# Configure git
+git config user.name "github-actions[bot]"
+git config user.email "github-actions[bot]@users.noreply.github.com"
+
+# Create annotated tag with [skip ci] to prevent infinite loop
+git tag -a "$NEW_TAG" -m "Release $NEW_VERSION [skip ci]"
+
+# Push tag
+git push origin "$NEW_TAG"
+
+# Export version to GitHub environment
+echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
+echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+echo "Successfully created and pushed tag: $NEW_TAG"

core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCommits.java

@@ -410,7 +410,7 @@ public void testCanReadOldCompressedManifestFiles() throws Exception {
     Assertions.assertThat(tasks).as("Should scan 1 files").hasSize(1);
   }
 
-  //@Test
+  // @Test
   public void testConcurrentFastAppends(@TempDir File dir) throws Exception {
     Assertions.assertThat(version(1)).as("Should create v1 metadata").exists().isFile();
     int threadsCount = 5;