Update cross-platform-build-verification.yml

Signed-off-by: 1minds3t <1minds3t@proton.me>

Author: 1minds3t

.github/workflows/cross-platform-build-verification.yml

@@ -1,38 +1,10 @@
-steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      
-      - name: Test in ${{ matrix.distro }} (Podman) [OPTIONAL - Non-blocking]
-        run: |
-          if [[ "${{ matrix.distro }}" == *"alpine"* ]]; then
-            SHELL="/bin/sh"
-          else
-            SHELL="/bin/bash"
-          fi
-          
-          podman run --rm -v $(pwd):/workspace:Z --platform ${{ matrix.platform }} ${{ matrix.distro }} $SHELL -c "
-            cd /workspace
-            
-            if command -v apt-get > /dev/null 2>&1; then
-              apt-get update && apt-get install -y python3 python3-pip python3-venv
-            elif command -v dnf > /dev/null 2>&1; then
-              dnf install -y python3 python3-pip
-            elif command -v apk > /dev/null 2>&1; then
-              apk add --no-cache python3 py3-pip py3-build gcc python3-dev musl-dev linux-headers
-            fi
-  
-            python3 -m pip install --upgrade pip build || python3 -m pip install --break-system-packages build
-            python3 -m build
-            python3 -m pip install dist/*.whl || python3 -m pip install --break-system-packages dist/*.whl
-            omnipkg --version
-          "
 # .github/workflows/cross-platform-build-verification.yml
 name: Cross-Platform Build Verification
 
 on:
   push:
     tags:
-      - 'v*'
+      - 'v*'  # Runs on version tags (blocks PyPI publish)
   release:
     types: [published]
   workflow_dispatch:
@@ -59,14 +31,16 @@ jobs:
           - runner: windows-latest
             label: "Windows x86_64"
 
-          # ADD THIS for Apple Silicon native testing
+            # ADD THIS BLOCK FOR APPLE SILICON
           - runner: macos-14
             label: "macOS ARM64 (Apple Silicon)"
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      # Only run setup-python on GitHub-hosted runners (Ubuntu/Windows)
+      # We skip this on self-hosted to use the system/Homebrew python
       - name: Set up Python 3.11
         if: ${{ !contains(matrix.runner, 'self-hosted') }} 
         uses: actions/setup-python@v5
@@ -86,24 +60,29 @@ jobs:
       - name: Build and Test
         shell: bash
         env:
-          PYTHONUNBUFFERED: "1"
+          PYTHONUNBUFFERED: "1" # Force Python to show logs immediately
         run: |
-          set -x
+          set -x # Debug mode: Print every command as it runs
           
+          # Use 'python' if 'python3' isn't available
           if command -v python3 &>/dev/null; then PY=python3; else PY=python; fi
           
+          # Create venv
           $PY -m venv .venv
           
+          # Activate venv (Handle Windows 'Scripts' vs Linux/Mac 'bin')
           if [ -f ".venv/bin/activate" ]; then
             source .venv/bin/activate
           else
             source .venv/Scripts/activate
           fi
           
+          # Install and build
           python -m pip install --upgrade pip build
           python -m build
           pip install dist/*.whl
           
+          # verify
           omnipkg --version
           8pkg --version
           omnipkg list
@@ -113,93 +92,43 @@ jobs:
         run: |
           echo "✅ VERIFIED: ${{ steps.arch.outputs.os }} ${{ steps.arch.outputs.arch }}"
 
-  # ═══════════════════════════════════════════════════════════════════
-  # CRITICAL TESTS: Fast tests that MUST pass before PyPI publish
-  # ═══════════════════════════════════════════════════════════════════
-  linux-distros-podman-critical:
-    name: Podman - ${{ matrix.distro }} (${{ matrix.platform }})
+  # Rootless Podman on self-hosted (safe for iptables/Tailscale)
+  linux-distros-podman:
+    name: Podman - ${{ matrix.distro }}
     runs-on: [self-hosted, linux, x64]
     strategy:
       fail-fast: false
       matrix:
         include:
-          # ✅ FAST: Native x86_64 tests (proves Podman works)
+          # x86_64 tests
           - distro: debian:12
             platform: linux/amd64
           - distro: ubuntu:24.04
             platform: linux/amd64
           - distro: fedora:39
             platform: linux/amd64
 
-          # ✅ FAST ARM64: Just the quick ones (proves architecture-agnostic)
-          - distro: debian:12      # 6m 43s - Acceptable
+          # ARM64 tests (via QEMU)
+          - distro: debian:12
             platform: linux/arm64
-          - distro: rockylinux:9   # 3m 45s - Fast enough
+         #- distro: ubuntu:24.04
+           #platform: linux/arm64
+          - distro: ubuntu:22.04
             platform: linux/arm64
-   
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      
-      - name: Test in ${{ matrix.distro }} (Podman)
-        run: |
-          if [[ "${{ matrix.distro }}" == *"alpine"* ]]; then
-            SHELL="/bin/sh"
-          else
-            SHELL="/bin/bash"
-          fi
-          
-          podman run --rm -v $(pwd):/workspace:Z --platform ${{ matrix.platform }} ${{ matrix.distro }} $SHELL -c "
-            cd /workspace
-            
-            # Install system deps
-            if command -v apt-get > /dev/null 2>&1; then
-              apt-get update && apt-get install -y python3 python3-pip python3-venv
-            elif command -v dnf > /dev/null 2>&1; then
-              dnf install -y python3 python3-pip
-            elif command -v apk > /dev/null 2>&1; then
-              apk add --no-cache python3 py3-pip py3-build gcc python3-dev musl-dev linux-headers
-            fi
-  
-            # Build and install
-            python3 -m pip install --upgrade pip build || python3 -m pip install --break-system-packages build
-            python3 -m build
-            python3 -m pip install dist/*.whl || python3 -m pip install --break-system-packages dist/*.whl
-            
-            # Verify
-            omnipkg --version
-          "
-
-  # ═══════════════════════════════════════════════════════════════════
-  # OPTIONAL TESTS: Slow ARM64 tests that DON'T block PyPI publish
-  # These run in parallel but PyPI doesn't wait for them
-  # ═══════════════════════════════════════════════════════════════════
-  linux-distros-podman-optional:
-    name: Podman - ${{ matrix.distro }} (${{ matrix.platform }}) [OPTIONAL]
-    runs-on: [self-hosted, linux, x64]
-    continue-on-error: true  # Don't fail the workflow if these fail
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # ⏰ SLOW ARM64: Nice to have, but not blockers
-          - distro: ubuntu:22.04   # 7m 28s
+         #- distro: fedora:39
+           #platform: linux/arm64
+          - distro: rockylinux:9
             platform: linux/arm64
-          - distro: alpine:latest  # 8m 28s
+          - distro: alpine:latest
             platform: linux/arm64
-          
-          # These can be re-enabled if you optimize wheel building:
-          # - distro: ubuntu:24.04
-          #   platform: linux/arm64
-          # - distro: fedora:39
-          #   platform: linux/arm64
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Test in ${{ matrix.distro }} (Podman)
         run: |
+          # Detect if Alpine and use /bin/sh, otherwise /bin/bash
           if [[ "${{ matrix.distro }}" == *"alpine"* ]]; then
             SHELL="/bin/sh"
           else
@@ -209,7 +138,7 @@ jobs:
           podman run --rm -v $(pwd):/workspace:Z --platform ${{ matrix.platform }} ${{ matrix.distro }} $SHELL -c "
             cd /workspace
             
-            # Install system deps
+            # --- 1. Install System Dependencies ---
             if command -v apt-get > /dev/null 2>&1; then
               apt-get update && apt-get install -y python3 python3-pip python3-venv
             elif command -v dnf > /dev/null 2>&1; then
@@ -218,18 +147,20 @@ jobs:
               apk add --no-cache python3 py3-pip py3-build gcc python3-dev musl-dev linux-headers
             fi
   
-            # Build and install
+            # --- 2. Install Build Tools ---
             python3 -m pip install --upgrade pip build || python3 -m pip install --break-system-packages build
+            
+            # --- 3. Build Project ---
             python3 -m build
+            
+            # --- 4. Install Wheel ---
             python3 -m pip install dist/*.whl || python3 -m pip install --break-system-packages dist/*.whl
 
-            # Verify
+            # --- 5. Verify ---
             omnipkg --version
           "
 
-  # ═══════════════════════════════════════════════════════════════════
-  # UNCHANGED: Docker jobs run on FREE GitHub runners (fast x86_64)
-  # ═══════════════════════════════════════════════════════════════════
+  # Docker on GitHub-hosted (plenty of space/memory, split for safety)
   linux-distros-docker-debian:
     name: Docker - Debian/Ubuntu
     runs-on: ubuntu-latest
@@ -252,9 +183,20 @@ jobs:
           docker run --rm -v $(pwd):/workspace ${{ matrix.distro }} /bin/bash -c "
             cd /workspace
             apt-get update && apt-get install -y python3 python3-pip python3-venv
+            
+            # Try upgrading pip normally first (for older distros like Ubuntu 20.04),
+            # then fall back to --break-system-packages (for newer distros like Ubuntu 24.04)
+            # 1. Try standard upgrade (works on Ubuntu 20.04, upgrades pip to latest)
+            # 2. If fails (Ubuntu 24.04+), install 'build' using the flag, but DO NOT upgrade pip
+            #    (Upgrading system pip on 24.04 causes "RECORD file not found" errors)
             python3 -m pip install --upgrade pip build || python3 -m pip install --break-system-packages build
+            
+            # Run build (now that pip/build are installed/upgraded)
             python3 -m build
+            
+            # Install wheels using the flag (latest pip supports it now)
             python3 -m pip install --break-system-packages dist/*.whl
+            
             omnipkg --version
           "
 
@@ -280,18 +222,28 @@ jobs:
           docker run --rm -v $(pwd):/workspace ${{ matrix.distro }} /bin/bash -c "
             cd /workspace
 
+            # --- RHEL/Rocky 8 Fix ---
+            # Default 'python3' on EL8 is 3.6 (Too old for pyproject.toml).
+            # We must detect EL8 and explicitly install python3.11 or python3.9.
+            
             if grep -q 'release 8' /etc/redhat-release; then
-              echo 'Detected EL8 - Installing Python 3.9...'
+              echo 'Detected EL8 (Rocky/Alma/RHEL 8) - Installing Python 3.9...'
               dnf install -y python39 python39-pip
+              
+              # Force 'python3' command to point to 3.9
               ln -sf /usr/bin/python3.9 /usr/bin/python3
               ln -sf /usr/bin/pip3.9 /usr/bin/pip3
             else
+              # Fedora and RHEL 9+ have modern Python by default
               dnf install -y python3 python3-pip
             fi
 
+            # --- Build & Install ---
             python3 -m pip install --upgrade pip build
             python3 -m build
             python3 -m pip install dist/*.whl
+            
+            # --- Verify ---
             omnipkg --version
           "
 
@@ -319,36 +271,39 @@ jobs:
               python -m build
               python -m pip install --break-system-packages dist/*.whl
             elif command -v apk &> /dev/null; then
+              # Install build dependencies required for compiling psutil
               apk add --no-cache python3 py3-pip py3-build gcc python3-dev musl-dev linux-headers
+              
               python3 -m build
               python3 -m pip install --break-system-packages dist/*.whl
             fi
             omnipkg --version
           "
-
   update-readme-stats:
     name: "📝 Update README Platform Stats"
-    needs: [build-matrix, linux-distros-podman-critical, linux-distros-docker-debian, linux-distros-docker-rhel, linux-distros-docker-other]
+    needs: [build-matrix, linux-distros-podman, linux-distros-docker-debian, linux-distros-docker-rhel, linux-distros-docker-other]
     runs-on: ubuntu-latest
-    if: success()
+    if: success() # Only run if all tests passed
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          fetch-depth: 0 # Need full history for commit
 
       - name: Update Platform Stats in README
         run: |
-          # Now counting: 5 native + 14 Docker/Podman = 19 total
-          # (We removed 5 slow ARM64 tests, but they were redundant anyway)
-          NATIVE_PLATFORMS=5  # x64 Linux, x64 macOS, ARM64 macOS, x64 Windows, ARM64 Python native
-          DOCKER_PLATFORMS=14 # All Docker/Podman distros (including 2 ARM64 Podman tests)
+          # Count platforms (update these numbers based on your matrix)
+          NATIVE_PLATFORMS=4  # Linux x64, macOS x64, macOS ARM64, Windows x64
+          DOCKER_PLATFORMS=14 # All your Docker/Podman distros
           TOTAL=$((NATIVE_PLATFORMS + DOCKER_PLATFORMS))
           
+          # Update the "Platforms Verified" badge
           sed -i "s/platforms-[0-9]*%20verified/platforms-${TOTAL}%20verified/" README.md
           
+          # Add macOS ARM64 to the platform table if not already there
           if ! grep -q "macOS ARM64" README.md; then
+            # Find the macOS Intel line and add ARM64 after it
             sed -i '/macOS Intel.*x86_64.*Intel/a | macOS ARM64 | ARM64 (Apple Silicon) | ✅ | Native installation |' README.md
           fi