correction

Author: mylonasc

.github/workflows/merged_build.yml

@@ -11,13 +11,15 @@ on:
       - '.github/workflows/README.md'
     tags:
       - 'v*'
+
   pull_request:
     branches:
       - release
     paths-ignore:
       - '**.md'
       - 'docs/**'
       - 'LICENSE'
+
   workflow_dispatch:
 
 jobs:
@@ -28,6 +30,7 @@ jobs:
     permissions:
       contents: read
       packages: write
+
     strategy:
       fail-fast: false
       matrix:
@@ -51,27 +54,20 @@ jobs:
       CIBW_DEBUG: "1"
       CIBW_PRERELEASE_PYTHONS: "True"
 
-      # Build selection (from ARM workflow; keep if you want same set on x86)
-      CIBW_SKIP: "pp*"
-      CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
-
-      # Host cache from your original workflow
+      # Linux host cache used by your original workflow (still fine on x86)
       HOST_CACHE_DIR: "/tmp/cibw_cache"
 
-      # ARM portable baseline flags (used only in ARM build step)
-      PORTABLE_FLAGS: "-O3 -march=armv8-a -mtune=generic -flto"
-
-      # Pin images for ARM (used only in ARM build step)
-      CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux_2_28"
-      CIBW_MUSLLINUX_AARCH64_IMAGE: "musllinux_1_2"
+      # ARM workflow defaults
+      CIBW_SKIP: "pp*"
+      CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      # FIX: do NOT force x64; let runner arch decide (works on ARM + x86)
+      # FIX: do not force x64 architecture (breaks ARM)
       - name: Set up Python (host)
         uses: actions/setup-python@v5
         with:
@@ -82,50 +78,43 @@ jobs:
           python -m pip install --upgrade pip
           pip install cibuildwheel
 
-      - name: Cache cibuildwheel artifacts (Linux host cache)
+      # Keep your original linux cache (works for both, but mostly helps x86 job)
+      - name: Cache cibuildwheel artifacts (Linux)
         if: runner.os == 'Linux'
         uses: actions/cache@v4
         with:
           path: ${{ env.HOST_CACHE_DIR }}
           key: ${{ runner.os }}-${{ runner.arch }}-cibw-cache-RocksDB-${{ env.ROCKSDB_VERSION }}
 
-      # ARM-only: RocksDB build cache (your .tar.gz store)
+      # -----------------------
+      # ARM-only: RocksDB cache
+      # -----------------------
       - name: Cache RocksDB builds (ARM)
         if: matrix.cibw_archs_linux == 'aarch64'
         uses: actions/cache@v4
         with:
           path: .cibw-rocksdb-cache
           key: >-
             rocksdb-${{ runner.os }}-linux-arch=${{ matrix.cibw_archs_linux }}-v=${{ env.ROCKSDB_VERSION }}
-            -manylinux=${{ env.CIBW_MANYLINUX_AARCH64_IMAGE }}-musllinux=${{ env.CIBW_MUSLLINUX_AARCH64_IMAGE }}
-            -flags=${{ env.PORTABLE_FLAGS }}
+            -manylinux=manylinux_2_28-musllinux=musllinux_1_2
+            -flags=-O3_-march=armv8-a_-mtune=generic_-flto
           restore-keys: |
             rocksdb-${{ runner.os }}-linux-arch=${{ matrix.cibw_archs_linux }}-v=${{ env.ROCKSDB_VERSION }}-
 
-      # -----------------------
-      # Build wheels (non-ARM)
-      # -----------------------
-      - name: Build wheels (non-ARM)
-        if: matrix.cibw_archs_linux != 'aarch64'
+      - name: Build wheels
         env:
+          # build correct Linux arch per runner
           CIBW_ARCHS_LINUX: ${{ matrix.cibw_archs_linux }}
-          CIBW_ENVIRONMENT: >-
-            PYREX_VERSION='${{ env.PYREX_VERSION }}'
-            ROCKSDB_VERSION='${{ env.ROCKSDB_VERSION }}'
-        run: cibuildwheel --output-dir wheelhouse
 
-      # -----------------------
-      # Build wheels (ARM)
-      # -----------------------
-      - name: Build wheels (ARM aarch64)
-        if: matrix.cibw_archs_linux == 'aarch64'
-        env:
-          CIBW_ARCHS_LINUX: "aarch64"
+          # ARM-specific images/flags (empty on x86)
+          CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.cibw_archs_linux == 'aarch64' && 'manylinux_2_28' || '' }}
+          CIBW_MUSLLINUX_AARCH64_IMAGE: ${{ matrix.cibw_archs_linux == 'aarch64' && 'musllinux_1_2' || '' }}
+          PORTABLE_FLAGS: ${{ matrix.cibw_archs_linux == 'aarch64' && '-O3 -march=armv8-a -mtune=generic -flto' || '' }}
 
-          # Use docker and mount cache directory into container
-          CIBW_CONTAINER_ENGINE: "docker; create-args: --network=host -v ${{ github.workspace }}/.cibw-rocksdb-cache:/cibw-cache"
+          # ARM-only: mount cache into container
+          CIBW_CONTAINER_ENGINE: ${{ matrix.cibw_archs_linux == 'aarch64' && format('docker; create-args: --network=host -v {0}/.cibw-rocksdb-cache:/cibw-cache', github.workspace) || '' }}
 
-          # Make sure these are present in the container env
+          # pass versions into your build
           CIBW_ENVIRONMENT: >-
             PYREX_VERSION='${{ env.PYREX_VERSION }}'
             ROCKSDB_VERSION='${{ env.ROCKSDB_VERSION }}'
@@ -135,22 +124,20 @@ jobs:
             CFLAGS="${{ env.PORTABLE_FLAGS }}"
             CXXFLAGS="${{ env.PORTABLE_FLAGS }}"
             LDFLAGS="-flto"
-            CC=clang
-            CXX=clang++
-            CMAKE_PREFIX_PATH="/opt/rocksdb"
-            CPPFLAGS="-I/opt/rocksdb/include $CPPFLAGS"
-            LDFLAGS="-L/opt/rocksdb/lib $LDFLAGS"
-            LD_LIBRARY_PATH="/opt/rocksdb/lib:$LD_LIBRARY_PATH"
-            PKG_CONFIG_PATH="/opt/rocksdb/lib/pkgconfig:$PKG_CONFIG_PATH"
 
+          # ARM-only: your cached RocksDB builder/restorer (no-op on x86)
           CIBW_BEFORE_ALL_LINUX: |
+            if [ "${{ matrix.cibw_archs_linux }}" != "aarch64" ]; then
+              echo "Non-ARM build: skipping ARM RocksDB bootstrap."
+              exit 0
+            fi
+
             set -euxo pipefail
 
             ARCH="aarch64"
             PREFIX="/opt/rocksdb"
             FLAGS="${PORTABLE_FLAGS}"
 
-            # Separate caches for glibc (manylinux) vs musl (musllinux)
             if [ -f /etc/alpine-release ]; then
               LIBC="musl"
               IMAGE_TAG="${CIBW_MUSLLINUX_AARCH64_IMAGE:-musllinux_unknown}"
@@ -172,7 +159,6 @@ jobs:
 
             echo "ℹ️ No cache found. Building RocksDB and caching..."
 
-            # Install deps
             if [ "${LIBC}" = "musl" ]; then
               apk add --no-cache \
                 bash build-base clang clang-dev cmake git ninja \
@@ -294,6 +280,7 @@ jobs:
     needs: test_wheels
     runs-on: ubuntu-latest
     if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/v')
+
     permissions:
       contents: read
       id-token: write