chore: wip

Author: chrisbbreuer

.github/workflows/precompile-php.yml

@@ -246,6 +246,34 @@ jobs:
           # Install additional dependencies needed for PHP extensions
           echo "Windows build dependencies installed for PHP compilation"
 
+      - name: Setup Launchpad Environment (macOS)
+        if: matrix.platform == 'darwin'
+        shell: bash
+        run: |
+          # Find and setup Launchpad environment variables
+          echo "🔧 Setting up Launchpad environment for macOS build..."
+
+          # Find pkg-config dynamically
+          PKG_CONFIG_PATH_FOUND=$(find "$HOME/.local" -name "pkg-config" -type f 2>/dev/null | head -1)
+          if [ -n "$PKG_CONFIG_PATH_FOUND" ]; then
+            PKG_CONFIG_DIR=$(dirname "$PKG_CONFIG_PATH_FOUND")
+            echo "LAUNCHPAD_PKG_CONFIG_DIR=$PKG_CONFIG_DIR" >> $GITHUB_ENV
+            echo "✅ Found pkg-config at: $PKG_CONFIG_DIR"
+          fi
+
+          # Find sed
+          SED_PATH_FOUND=$(find "$HOME/.local" -path "*/gnu.org/sed/*/bin/sed" -type f 2>/dev/null | head -1)
+          if [ -n "$SED_PATH_FOUND" ]; then
+            SED_DIR=$(dirname "$SED_PATH_FOUND")
+            echo "LAUNCHPAD_SED_DIR=$SED_DIR" >> $GITHUB_ENV
+            echo "✅ Found sed at: $SED_DIR"
+          fi
+
+          # Setup comprehensive PKG_CONFIG_PATH
+          PKG_PATHS=$(find "$HOME/.local" -name "pkgconfig" -type d 2>/dev/null | tr '\n' ':')
+          echo "LAUNCHPAD_PKG_CONFIG_PATH=$PKG_PATHS" >> $GITHUB_ENV
+          echo "✅ PKG_CONFIG_PATH setup with $(echo "$PKG_PATHS" | tr ':' '\n' | wc -l) directories"
+
       - name: Build PHP
         shell: bash
         env:
@@ -255,53 +283,21 @@ jobs:
           TARGET_ARCH: ${{ matrix.arch }}
           BUILD_DIR: ${{ github.workspace }}/build
           OUTPUT_DIR: ${{ github.workspace }}/binaries
+          # Ensure Launchpad environment is available for all macOS builds
+          PATH: ${{ matrix.platform == 'darwin' && format('{0}:{1}:{2}', env.LAUNCHPAD_PKG_CONFIG_DIR, env.LAUNCHPAD_SED_DIR, env.PATH) || env.PATH }}
+          PKG_CONFIG_PATH: ${{ matrix.platform == 'darwin' && env.LAUNCHPAD_PKG_CONFIG_PATH || env.PKG_CONFIG_PATH }}
         run: |
-          # Source Launchpad environment if available (macOS only)
+          # Verify environment setup for macOS
           if [ "${{ matrix.platform }}" = "darwin" ]; then
-            # Find and source the best available Launchpad environment
-            if [ -f "$HOME/.local/build-env.sh" ]; then
-              echo "🔧 Sourcing Launchpad build environment for macOS build..."
-              source "$HOME/.local/build-env.sh"
-              echo "✅ Environment sourced from build-env.sh"
-            elif [ -f "$HOME/.local/share/launchpad/global/build-env.sh" ]; then
-              echo "🔧 Sourcing global Launchpad environment for macOS build..."
-              source "$HOME/.local/share/launchpad/global/build-env.sh"
-              echo "✅ Environment sourced from global build-env.sh"
-            else
-              echo "⚠️ No Launchpad environment file found"
-            fi
-
-            # Always ensure pkg-config is available - find it dynamically
-            echo "🔍 Finding and adding pkg-config to PATH..."
-            PKG_CONFIG_PATH_FOUND=$(find "$HOME/.local" -name "pkg-config" -type f 2>/dev/null | head -1)
-            if [ -n "$PKG_CONFIG_PATH_FOUND" ]; then
-              PKG_CONFIG_DIR=$(dirname "$PKG_CONFIG_PATH_FOUND")
-              export PATH="$PKG_CONFIG_DIR:$PATH"
-              echo "✅ Added pkg-config to PATH from: $PKG_CONFIG_DIR"
-            fi
-
-            # Also ensure sed is available
-            SED_PATH_FOUND=$(find "$HOME/.local" -path "*/gnu.org/sed/*/bin/sed" -type f 2>/dev/null | head -1)
-            if [ -n "$SED_PATH_FOUND" ]; then
-              SED_DIR=$(dirname "$SED_PATH_FOUND")
-              export PATH="$SED_DIR:$PATH"
-              echo "✅ Added sed to PATH from: $SED_DIR"
-            fi
-
-            echo "✅ Current PATH includes freedesktop.org: $(echo $PATH | grep -o freedesktop.org || echo 'NO')"
+            echo "🔧 Verifying Launchpad environment setup..."
+            echo "✅ PATH includes pkg-config: $(echo $PATH | grep -o freedesktop.org || echo 'NO')"
             echo "✅ PKG_CONFIG_PATH: ${PKG_CONFIG_PATH:-'NOT SET'}"
 
-            # Verify pkg-config is accessible and set up PKG_CONFIG_PATH
+            # Verify pkg-config is accessible
             if command -v pkg-config >/dev/null 2>&1; then
               echo "✅ pkg-config is accessible: $(which pkg-config)"
               echo "✅ pkg-config version: $(pkg-config --version)"
 
-              # Ensure PKG_CONFIG_PATH includes all Launchpad library paths
-              echo "🔧 Setting up comprehensive PKG_CONFIG_PATH..."
-              PKG_PATHS=$(find "$HOME/.local" -name "pkgconfig" -type d 2>/dev/null | tr '\n' ':')
-              export PKG_CONFIG_PATH="$PKG_PATHS:${PKG_CONFIG_PATH:-}"
-              echo "✅ PKG_CONFIG_PATH set to: $PKG_CONFIG_PATH"
-
               # Test libxml-2.0 specifically
               if pkg-config --exists libxml-2.0; then
                 echo "✅ libxml-2.0 package found via pkg-config"
@@ -311,13 +307,13 @@ jobs:
                 echo "🔍 Available packages: $(pkg-config --list-all | head -10)"
               fi
             else
-              echo "❌ pkg-config still not accessible"
+              echo "❌ pkg-config not accessible"
               echo "🔍 All pkg-config instances:"
               find "$HOME/.local" -name "pkg-config" -type f 2>/dev/null
             fi
           fi
 
-          # Run the build script with enhanced environment
+          # Run the build script with properly configured environment
           bun run scripts/build-php.ts
 
       - name: Create tarball (Unix)