CI fixes for whl

Author: delgado-jacob

.github/workflows/ci.yml

@@ -93,10 +93,10 @@ jobs:
   build-python-wheels:
     name: Build Python wheels
     runs-on: ${{ matrix.os }}
-    # needs: [ test-go, test-python ]
+#    needs: [test-go, test-python]
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - name: Checkout code
@@ -115,52 +115,38 @@ jobs:
       - name: Install cibuildwheel
         run: pip install cibuildwheel==2.18.1
 
-      # Pre-build the Go shared library BEFORE running cibuildwheel
-      - name: Pre-build Go library (Linux)
-        if: runner.os == 'Linux'
-        run: |
-          # Build for Linux
-          CGO_ENABLED=1 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.so ./pkg/bindings
-          ls -la python/spl_toolkit/
-          file python/spl_toolkit/*.so
-
-      - name: Pre-build Go library (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          # Build for both architectures on macOS
-          # x86_64
-          CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit_amd64.dylib ./pkg/bindings
-          # arm64
-          CGO_ENABLED=1 GOARCH=arm64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit_arm64.dylib ./pkg/bindings
-          # Create universal binary
-          lipo -create python/spl_toolkit/libspl_toolkit_amd64.dylib python/spl_toolkit/libspl_toolkit_arm64.dylib -output python/spl_toolkit/libspl_toolkit.dylib
-          rm python/spl_toolkit/libspl_toolkit_amd64.dylib python/spl_toolkit/libspl_toolkit_arm64.dylib
-          ls -la python/spl_toolkit/
-          file python/spl_toolkit/*.dylib
-
-      - name: Pre-build Go library (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          # Build for Windows
-          $env:CGO_ENABLED = "1"
-          go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.dll ./pkg/bindings
-          dir python\spl_toolkit\
-
-      # Now run cibuildwheel with the pre-built libraries
       - name: Build Linux wheels
         if: runner.os == 'Linux'
         env:
           CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
           CIBW_SKIP: "*musllinux* *i686* *win32*"
           CIBW_BUILD_VERBOSITY: 3
-          # Don't need to install Go since library is pre-built
+          # Install Go in the manylinux container without using yum
+          CIBW_BEFORE_ALL_LINUX: |
+            # Download and install Go directly using curl (which is pre-installed)
+            curl -L https://go.dev/dl/go1.24.6.linux-amd64.tar.gz -o /tmp/go.tar.gz
+            tar -C /opt -xzf /tmp/go.tar.gz
+            export PATH=/opt/go/bin:$PATH
+            go version
+            # Verify gcc is available (should be pre-installed in manylinux images)
+            gcc --version
+          # Build the shared library before building each wheel
           CIBW_BEFORE_BUILD_LINUX: |
-            # Library is already built, just verify it exists
-            ls -la {project}/python/spl_toolkit/*.so
+            export PATH=/opt/go/bin:$PATH
+            export CGO_ENABLED=1
+            export CIBUILDWHEEL=1
+            cd {project}
+            # Build the Go shared library - note the path matches your setup.py
+            go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.so ./pkg/bindings
+            # Verify the library was created
+            ls -la python/spl_toolkit/*.so
+            file python/spl_toolkit/*.so
           CIBW_ENVIRONMENT_LINUX: |
+            PATH=/opt/go/bin:$PATH
+            CGO_ENABLED=1
             CIBUILDWHEEL=1
             LD_LIBRARY_PATH={project}/python/spl_toolkit:$LD_LIBRARY_PATH
-          # Use newer manylinux image
+          # Use manylinux_2_28 for newer base image (AlmaLinux 8 based)
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
           # Repair wheels to include the shared library
@@ -177,15 +163,26 @@ jobs:
         if: runner.os == 'macOS'
         env:
           CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
-          CIBW_SKIP: "*musllinux*"
+          CIBW_SKIP: "*musllinux* *_universal2*"
           CIBW_BUILD_VERBOSITY: 3
-          CIBW_ARCHS_MACOS: "universal2"  # Since we built a universal binary
-          # Don't need to build, library is pre-built
+          CIBW_ARCHS_MACOS: "x86_64 arm64"
+          # Build the shared library before building each wheel
           CIBW_BEFORE_BUILD_MACOS: |
-            # Library is already built, just verify it exists
-            ls -la {project}/python/spl_toolkit/*.dylib
-            file {project}/python/spl_toolkit/*.dylib
+            export CGO_ENABLED=1
+            export CIBUILDWHEEL=1
+            cd {project}
+            # Build the Go shared library for the current architecture
+            if [[ "$ARCHFLAGS" == *"arm64"* ]]; then
+              export GOARCH=arm64
+            else
+              export GOARCH=amd64
+            fi
+            go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.dylib ./pkg/bindings
+            # Verify the library was created
+            ls -la python/spl_toolkit/*.dylib
+            file python/spl_toolkit/*.dylib
           CIBW_ENVIRONMENT_MACOS: |
+            CGO_ENABLED=1
             CIBUILDWHEEL=1
             DYLD_LIBRARY_PATH={project}/python/spl_toolkit:$DYLD_LIBRARY_PATH
           # Use delocate to fix macOS wheels
@@ -204,11 +201,15 @@ jobs:
           CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
           CIBW_SKIP: "*musllinux* *win32*"
           CIBW_BUILD_VERBOSITY: 3
-          # Don't need to build, library is pre-built
+          # Build the shared library before building each wheel
           CIBW_BEFORE_BUILD_WINDOWS: |
-            # Library is already built, just verify it exists
-            dir {project}\python\spl_toolkit\*.dll
+            cd {project}
+            set CGO_ENABLED=1
+            set CIBUILDWHEEL=1
+            go build -buildmode=c-shared -o python\spl_toolkit\libspl_toolkit.dll .\pkg\bindings
+            dir python\spl_toolkit\*.dll
           CIBW_ENVIRONMENT_WINDOWS: |
+            CGO_ENABLED=1
             CIBUILDWHEEL=1
             PATH={project}\python\spl_toolkit;%PATH%
           # Test that the wheel works
@@ -227,7 +228,7 @@ jobs:
   build:
     name: Build Artifacts
     runs-on: ${{ matrix.os }}
-    # needs: [test-go, test-python]
+#    needs: [test-go, test-python]
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
@@ -305,9 +306,9 @@ jobs:
   docker:
     name: Build and Push Docker Image
     runs-on: ubuntu-latest
-    # needs: [test-go, test-python]
+#    needs: [test-go, test-python]
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
-    
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4