Merge branch 'main' into ctty/dp-tbl

Author: CTTY

…ation_tests/testdata/spark/entrypoint.sh .github/actions/get-msrv/action.ymlcrates/integration_tests/testdata/spark/entrypoint.sh renamed to .github/actions/get-msrv/action.yml crates/integration_tests/testdata/spark/entrypoint.sh renamed to .github/actions/get-msrv/action.yml

@@ -1,5 +1,3 @@
-#!/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
@@ -16,18 +14,22 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
-
-set -e
-
-start-master.sh -p 7077
-start-worker.sh spark://spark-iceberg:7077
 
-echo "Starting provision"
-python3 ./provision.py
+name: Get MSRV
+description: Get the Minimum Supported Rust Version from Cargo.toml
 
-echo "Finished provisioning"
-touch /tmp/ready
+outputs:
+  msrv:
+    description: The MSRV extracted from Cargo.toml
+    value: ${{ steps.get-msrv.outputs.msrv }}
 
-echo "Print logs"
-tail -f $SPARK_HOME/logs/*
+runs:
+  using: composite
+  steps:
+    - name: Get MSRV
+      id: get-msrv
+      shell: bash
+      run: |
+        msrv=$(grep '^rust-version' Cargo.toml | sed 's/.*"\(.*\)".*/\1/')
+        echo "msrv=$msrv" >> $GITHUB_OUTPUT
+        echo "MSRV is $msrv"

.github/workflows/audit.yml

@@ -39,6 +39,7 @@ on:
 jobs:
   security_audit:
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/iceberg-rust'
     steps:
       - uses: actions/checkout@v6
       - name: Setup Rust toolchain

.github/workflows/ci.yml

@@ -40,9 +40,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
-env:
-  rust_msrv: "1.87"
-
 jobs:
   check:
     runs-on: ${{ matrix.os }}
@@ -184,10 +181,13 @@ jobs:
         uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get MSRV
+        id: get-msrv
+        uses: ./.github/actions/get-msrv
       - name: Setup MSRV Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
-          rust-version: ${{ env.rust_msrv }}
+          rust-version: ${{ steps.get-msrv.outputs.msrv }}
       - name: Setup Nightly Rust toolchain
         uses: ./.github/actions/setup-builder
       - name: Check MSRV

.github/workflows/publish.yml

@@ -26,9 +26,6 @@ on:
       - "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
   workflow_dispatch:
 
-env:
-  rust_msrv: "1.87"
-
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -48,10 +45,14 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: Get MSRV
+        id: get-msrv
+        uses: ./.github/actions/get-msrv
+
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
-          rust-version: ${{ env.rust_msrv }}
+          rust-version: ${{ steps.get-msrv.outputs.msrv }}
 
       - name: Publish ${{ matrix.package }}
         working-directory: ${{ matrix.package }}

.github/workflows/release_python.yml

@@ -23,13 +23,11 @@ on:
     types:
       - completed
   workflow_dispatch:
-
-env:
-  rust_msrv: "1.87"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}-${{ github.event_name }}
-  cancel-in-progress: true
+    inputs:
+      release_tag:
+        description: 'Release tag (e.g., v0.4.0 or v0.4.0-rc.1)'
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -49,12 +47,20 @@ jobs:
       cargo-version: ${{ steps.validate.outputs.cargo-version }}
       is-rc: ${{ steps.validate.outputs.is-rc }}
     steps:
+      - uses: actions/checkout@v6
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+
       - name: Validate release tag format
         id: validate
+        # Use input for workflow_dispatch, otherwise use `workflow_run.head_branch`
         # Note, `workflow_run.head_branch` does not contain `refs/tags/` prefix, just the tag name, i.e. `v0.4.0` or `v0.4.0-rc.1`
         # Valid formats: v<major>.<minor>.<patch> OR v<major>.<minor>.<patch>-rc.<release_candidate>
         run: |
-          RELEASE_TAG="${{ github.event.workflow_run.head_branch }}"
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            RELEASE_TAG="${{ github.event.inputs.release_tag }}"
+          else
+            RELEASE_TAG="${{ github.event.workflow_run.head_branch }}"
+          fi
           echo "Validating release tag: $RELEASE_TAG"
           if [[ ! "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$ ]]; then
             echo "❌ Invalid release tag format: $RELEASE_TAG"
@@ -68,6 +74,26 @@ jobs:
           CARGO_VERSION="${RELEASE_TAG#v}"
           echo "Cargo version (without v prefix): $CARGO_VERSION"
           
+          # For manual triggers, validate that the tag matches the version in Cargo.toml
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            # Extract base version (without -rc.X suffix) for comparison with Cargo.toml
+            BASE_VERSION="${CARGO_VERSION%-rc.*}"
+            echo "Base version (for Cargo.toml comparison): $BASE_VERSION"
+            
+            # Read version from Cargo.toml and validate it matches
+            CARGO_TOML_VERSION=$(grep '^version = ' bindings/python/Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
+            echo "Version in bindings/python/Cargo.toml: $CARGO_TOML_VERSION"
+            
+            if [ "$BASE_VERSION" != "$CARGO_TOML_VERSION" ]; then
+              echo "❌ Version mismatch!"
+              echo "   Release tag base version: $BASE_VERSION"
+              echo "   bindings/python/Cargo.toml version: $CARGO_TOML_VERSION"
+              echo "Please ensure the release tag matches the version in Cargo.toml"
+              exit 1
+            fi
+            echo "✅ Version matches bindings/python/Cargo.toml"
+          fi
+          
           # Check if this is a release candidate
           if [[ "$RELEASE_TAG" =~ -rc\.[0-9]+$ ]]; then
             IS_RC="true"
@@ -147,10 +173,14 @@ jobs:
       - uses: actions/setup-python@v6
         with:
           python-version: 3.12
+      - name: Get MSRV
+        id: get-msrv
+        uses: ./.github/actions/get-msrv
+
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
-          rust-version: ${{ env.rust_msrv }}
+          rust-version: ${{ steps.get-msrv.outputs.msrv }}
       - uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}

.github/workflows/release_python_nightly.yml

@@ -22,9 +22,6 @@ on:
     - cron: "0 0 * * *" # Runs at midnight UTC every day
   workflow_dispatch: # Allows manual triggering
 
-env:
-  rust_msrv: "1.87"
-
 permissions:
   contents: read
 
@@ -88,10 +85,14 @@ jobs:
         with:
           python-version: 3.12
 
+      - name: Get MSRV
+        id: get-msrv
+        uses: ./.github/actions/get-msrv
+
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
-          rust-version: ${{ env.rust_msrv }}
+          rust-version: ${{ steps.get-msrv.outputs.msrv }}
 
       - uses: PyO3/maturin-action@v1
         with:

Cargo.lock

@@ -1,5 +1,5 @@
 Apache Iceberg Rust
-Copyright 2023-2024 The Apache Software Foundation
+Copyright 2023-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

NOTICE

@@ -1,5 +1,5 @@
 Apache Iceberg Rust
-Copyright 2023-2024 The Apache Software Foundation
+Copyright 2023-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).