chore: wip

Author: chrisbbreuer

.github/workflows/build-binaries.yml

@@ -111,6 +111,8 @@ jobs:
           echo "  - Platform: linux"
           echo "  - Architecture: $(uname -m)"
           echo "  - Network connectivity test:"
+          # Temporarily modify PATH to prioritize system binaries over launchpad binaries
+          export PATH="/usr/bin:/usr/local/bin:/bin:$PATH"
           curl -I --connect-timeout 10 https://dist.pkgx.dev/ || echo "  ⚠️ Network connectivity issues detected"
 
           # Set environment variables for better debugging
@@ -155,9 +157,11 @@ jobs:
           # Install PHP dependencies via Launchpad with enhanced debugging
           echo "🔧 Installing PHP dependencies via Launchpad..."
           echo "🔍 Debug info:"
-          echo "  - Platform: linux"
+          echo "  - Platform: darwin"
           echo "  - Architecture: $(uname -m)"
           echo "  - Network connectivity test:"
+          # Temporarily modify PATH to prioritize system binaries over launchpad binaries
+          export PATH="/usr/bin:/usr/local/bin:/bin:$PATH"
           curl -I --connect-timeout 10 https://dist.pkgx.dev/ || echo "  ⚠️ Network connectivity issues detected"
 
           # Set environment variables for better debugging
@@ -233,6 +237,10 @@ jobs:
       - name: Download and extract PHP source
         run: |
           cd ${{ env.BUILD_DIR }}
+          # Temporarily modify PATH to prioritize system binaries over launchpad binaries
+          # This prevents conflicts with launchpad-installed binaries that may have library dependencies
+          export PATH="/usr/bin:/usr/local/bin:/bin:$PATH"
+          # Use system curl instead of launchpad curl to avoid library conflicts
           curl -fsSL "https://www.php.net/distributions/php-${{ matrix.php_version }}.tar.gz" -o php.tar.gz
           tar -xzf php.tar.gz
           cd php-${{ matrix.php_version }}

packages/launchpad/src/install-core.ts

@@ -303,17 +303,61 @@ export async function installPackage(packageName: string, packageSpec: string, i
   }
 
   // Download and install
-  const installedFiles = await downloadPackage(domain, version, os, architecture, installPath)
+  try {
+    const installedFiles = await downloadPackage(domain, version, os, architecture, installPath)
 
-  // Create common library symlinks for better compatibility
-  const packageDir = path.join(installPath, domain, `v${version}`)
-  await createLibrarySymlinks(packageDir, domain)
+    // Create common library symlinks for better compatibility
+    const packageDir = path.join(installPath, domain, `v${version}`)
+    await createLibrarySymlinks(packageDir, domain)
 
-  if (config.verbose) {
-    console.log(`Successfully installed ${domain} v${version}`)
+    if (config.verbose) {
+      console.log(`Successfully installed ${domain} v${version}`)
+    }
+
+    return installedFiles
   }
+  catch (error) {
+    // Special fallback for gnu.org/binutils - try lower version if 2.45.0 fails
+    if (domain === 'gnu.org/binutils' && version === '2.45.0') {
+      const fallbackVersions = ['2.44.0', '2.43.0', '2.42.0']
+
+      for (const fallbackVersion of fallbackVersions) {
+        if (config.verbose) {
+          console.warn(`⚠️  Version ${version} not available, trying fallback version ${fallbackVersion}`)
+        }
+
+        try {
+          const installedFiles = await downloadPackage(domain, fallbackVersion, os, architecture, installPath)
+
+          // Create common library symlinks for better compatibility
+          const packageDir = path.join(installPath, domain, `v${fallbackVersion}`)
+          await createLibrarySymlinks(packageDir, domain)
 
-  return installedFiles
+          if (config.verbose) {
+            console.log(`✅ Successfully installed ${domain} v${fallbackVersion} (fallback from v${version})`)
+          }
+
+          return installedFiles
+        }
+        catch {
+          if (config.verbose) {
+            console.warn(`⚠️  Fallback version ${fallbackVersion} also failed, trying next...`)
+          }
+          continue
+        }
+      }
+
+      // If all fallback versions failed
+      if (config.verbose) {
+        console.error(`❌ All versions failed for ${domain}: ${version}, ${fallbackVersions.join(', ')}`)
+        console.error(`   Original error: ${error instanceof Error ? error.message : String(error)}`)
+      }
+      throw error // Re-throw the original error
+    }
+
+    // Re-throw the original error for other packages
+    throw error
+  }
 }
 
 /**