Merge branch 'main' into release

Author: wangxiaoying

.github/workflows/benchmark.yml

@@ -14,7 +14,7 @@ jobs:
   benchmark:
     runs-on: [self-hosted, linux, x64, connectorx-benchmark]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install tools
         run: |

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install tools
         run: |
@@ -142,7 +142,7 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
@@ -171,7 +171,7 @@ jobs:
           components: rustfmt
           default: true
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: "17"

.github/workflows/docs.yml

@@ -9,7 +9,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
@@ -57,7 +57,7 @@ jobs:
     name: A job to automate contrib in readme
     steps:
         - name: Contribute List
-          uses: akhilmhdh/[email protected].10
+          uses: akhilmhdh/[email protected].11
           with:
               image_size: 66
           env:

.github/workflows/import-test.yml

@@ -20,7 +20,7 @@ jobs:
         os: [ubuntu-latest, macos-10.15, windows-latest]
         python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup python
         uses: actions/setup-python@v5

.github/workflows/release.yml

@@ -8,13 +8,19 @@ on:
 
 jobs:
   linux:
-    runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux_2_28_x86_64
+    runs-on: ${{ matrix.platform.runs-on }}
+    container: quay.io/pypa/manylinux_2_28_${{ matrix.platform.arch }}
     strategy:
       matrix:
-        python-version: [[310, "3.10"], [311, "3.11"], [312, "3.12"], [313, "3.13"]]
+        platform:
+          [
+            { "arch": "x86_64", "runs-on": "ubuntu-latest" },
+            { "arch": "aarch64", "runs-on": "ubuntu-22.04-arm" },
+          ]
+        python-version:
+          [[310, "3.10"], [311, "3.11"], [312, "3.12"], [313, "3.13"]]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set python version
         run: |
@@ -66,83 +72,20 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: "ubuntu-latest-${{ matrix.python-version[1] }}"
-          path: connectorx-python/target/wheels/*.whl
-
-  linux-aarch:
-    runs-on: ubuntu-22.04-arm
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      # Check architecture of the target machine
-      - name: Check Target Architecture
-        run: |
-          echo "Architecture: $(uname -m)"
-          if [[ $(uname -m) != "aarch64" ]]; then
-            echo "Error: This workflow requires ARM architecture (aarch64)."
-            exit 1
-          fi
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Setup Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: rustfmt
-          target: aarch64-unknown-linux-gnu
-          default: true
-
-      - name: Setup Just
-        uses: extractions/setup-just@v3
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install Tools
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y mysql-client libpq-dev freetds-dev krb5-locales clang libkrb5-dev build-essential gcc musl-tools libsasl2-modules-gssapi-mit libgssapi-krb5-2 krb5-user
-      - name: Setup Poetry
-        uses: Gr1N/setup-poetry@v9
-
-      - name: Setup Project
-        run: |
-          just bootstrap-python
-          python -m pip install --upgrade pip
-          pip install maturin
-
-      - name: Build Wheel (Native)
-        run: |
-          maturin build -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python${{ matrix.python-version }} --release
-        env:
-          SQLITE3_STATIC: 1
-          KRB5_INCLUDE_DIR: /usr/include
-          KRB5_LIB_DIR: /usr/lib/aarch64-linux-gnu
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: "linux-arm-${{ matrix.python-version }}"
+          name: "linux-${{matrix.platform.arch}}-${{ matrix.python-version[1] }}"
           path: connectorx-python/target/wheels/*.whl
 
   win-and-mac:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["windows-latest", "macos-13"]
+        os: ["windows-latest", "macos-15-intel"]
         python-version: ["3.10", "3.11", "3.12", "3.13"]
         include:
-          - os: "macos-13"
+          - os: "macos-15-intel"
             features: "--features integrated-auth-gssapi"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ankane/setup-mysql@v1
         with:
@@ -189,7 +132,7 @@ jobs:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ankane/setup-mysql@v1
         with:
@@ -236,86 +179,43 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
-        os: [macos-13, ubuntu-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          architecture: x64
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: "${{ matrix.os }}-${{ matrix.python-version }}"
-
-      - run: |
-          pip install *.whl
-          python -c "import connectorx"
-
-  verify-apple-arm:
-    runs-on: ${{ matrix.os }}
-    needs: [apple-arm]
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-        os: [macos-latest]
+        os:
+          [
+            macos-15-intel,
+            ubuntu-latest,
+            windows-latest,
+            ubuntu-22.04-arm,
+            macos-latest,
+          ]
+        include:
+          # override artifact-prefix for linux variants
+          - os: "ubuntu-latest"
+            artifact-prefix: "linux-x86_64"
+          - os: "ubuntu-22.04-arm"
+            artifact-prefix: "linux-aarch64"
+          - os: "macos-latest"
+            artifact-prefix: "macos-arm"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
-          name: "macos-arm-${{ matrix.python-version }}"
+          name: "${{ matrix.artifact-prefix || matrix.os }}-${{ matrix.python-version }}"
 
       - run: |
           pip install *.whl
           python -c "import connectorx"
 
-  verify-linux-arm:
-    runs-on: ubuntu-22.04-arm
-    needs: [linux-aarch]
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      # Check architecture of the target machine
-      - name: Check Target Architecture
-        run: |
-          echo "Architecture: $(uname -m)"
-          if [[ $(uname -m) != "aarch64" ]]; then
-            echo "Error: This workflow requires ARM architecture (aarch64)."
-            exit 1
-          fi
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: "linux-arm-${{ matrix.python-version }}"
-
-      - name: Install and Test
-        run: |
-          python -m pip install --upgrade pip
-          pip install *.whl
-          python -c 'import connectorx'
-
   upload:
     runs-on: ubuntu-latest
-    needs: [verify, verify-apple-arm, verify-linux-arm]
+    needs: [verify]
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
 
       - name: Setup environment
         run: |