CI fixes for whl

Author: delgado-jacob

.github/workflows/ci.yml

@@ -93,11 +93,11 @@ jobs:
   build-python-wheels:
     name: Build Python wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    # needs: [test-go, test-python]
+#    needs: [ test-go, test-python ]
     strategy:
       matrix:
         # Must use different OS runners for binary compatibility
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
       fail-fast: false  # Don't cancel other jobs if one fails
 
     steps:
@@ -125,77 +125,82 @@ jobs:
           go mod verify
 
       # Linux-specific build
+      - name: Pre-build Go library (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          # Build the Go library on the host before running cibuildwheel
+          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: Build wheels (Linux)
         if: runner.os == 'Linux'
         env:
           CIBW_BUILD: "cp3{8,9,10,11,12}-*"  # All Python versions at once
           CIBW_SKIP: "*-musllinux* *-manylinux_i686"
           CIBW_ARCHS_LINUX: "x86_64"  # Add "aarch64" if you need ARM support
           CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28"
-          CIBW_BEFORE_ALL_LINUX: |
-            # Install Go in the container
-            curl -L https://go.dev/dl/go${{ env.GO_VERSION }}.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
           CIBW_BEFORE_BUILD_LINUX: |
-            export PATH=/opt/go/bin:$PATH
-            export CGO_ENABLED=1
-            cd {project}
-            go mod download
-            go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.so ./pkg/bindings
-            ls -la python/spl_toolkit/*.so
+            # Library is already built, just verify it exists
+            ls -la {project}/spl_toolkit/*.so
+            file {project}/spl_toolkit/*.so
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair -w {dest_dir} {wheel}"
           CIBW_TEST_COMMAND: "python -c 'import spl_toolkit'"
+          CIBW_ENVIRONMENT_LINUX: "CIBUILDWHEEL=1"
         run: |
           cd python
           python -m cibuildwheel --output-dir ../dist
 
       # macOS-specific build (Universal2 for both Intel and Apple Silicon)
+      - name: Pre-build Go library (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          # Build universal binary for macOS
+          CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit_amd64.dylib ./pkg/bindings
+          CGO_ENABLED=1 GOARCH=arm64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit_arm64.dylib ./pkg/bindings
+          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: Build wheels (macOS)
         if: runner.os == 'macOS'
         env:
           CIBW_BUILD: "cp3{8,9,10,11,12}-*"
           CIBW_SKIP: "*-musllinux*"
           CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"  # Build for all architectures
           CIBW_BEFORE_BUILD_MACOS: |
-            export CGO_ENABLED=1
-            cd {project}
-            go mod download
-            # Build architecture-specific library
-            if [[ "$ARCHFLAGS" == *"arm64"* ]]; then
-              GOARCH=arm64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.dylib ./pkg/bindings
-            elif [[ "$ARCHFLAGS" == *"x86_64"* ]]; then
-              GOARCH=amd64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.dylib ./pkg/bindings
-            else
-              # Universal build - create both and combine
-              GOARCH=amd64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit_x86_64.dylib ./pkg/bindings
-              GOARCH=arm64 go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit_arm64.dylib ./pkg/bindings
-              lipo -create python/spl_toolkit/libspl_toolkit_x86_64.dylib python/spl_toolkit/libspl_toolkit_arm64.dylib -output python/spl_toolkit/libspl_toolkit.dylib
-              rm python/spl_toolkit/libspl_toolkit_x86_64.dylib python/spl_toolkit/libspl_toolkit_arm64.dylib
-            fi
-            ls -la python/spl_toolkit/*.dylib
+            # Library is already built, just verify it exists
+            ls -la {project}/spl_toolkit/*.dylib
+            file {project}/spl_toolkit/*.dylib
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
           CIBW_TEST_COMMAND: "python -c 'import spl_toolkit'"
           CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64"  # Skip ARM tests on x86 runners
+          CIBW_ENVIRONMENT_MACOS: "CIBUILDWHEEL=1"
         run: |
           cd python
           python -m cibuildwheel --output-dir ../dist
 
       # Windows-specific build
+      - name: Pre-build Go library (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          # Build the Go library on the host before running cibuildwheel
+          $env:CGO_ENABLED = "1"
+          go build -buildmode=c-shared -o python/spl_toolkit/libspl_toolkit.dll ./pkg/bindings
+          dir python\spl_toolkit\
+
       - name: Build wheels (Windows)
         if: runner.os == 'Windows'
         env:
           CIBW_BUILD: "cp3{8,9,10,11,12}-*"
           CIBW_SKIP: "*-musllinux* *-win32"
           CIBW_ARCHS_WINDOWS: "AMD64"
           CIBW_BEFORE_BUILD_WINDOWS: |
-            cd {project}
-            go mod download
-            set CGO_ENABLED=1
-            go build -buildmode=c-shared -o python\spl_toolkit\libspl_toolkit.dll .\pkg\bindings
-            dir python\spl_toolkit\*.dll
+            # Library is already built, just verify it exists
+            dir {project}\spl_toolkit\*.dll
           CIBW_TEST_COMMAND: "python -c \"import spl_toolkit\""
+          CIBW_ENVIRONMENT_WINDOWS: "CIBUILDWHEEL=1"
         run: |
           cd python
           python -m cibuildwheel --output-dir ../dist