Add support to build with master branch of PHP

shivammathur · shivammathur · commit d9403b0f5a96 · 2025-05-30T22:27:14.000+05:30
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
         arch: [x64, x86]
         ts: [nts, ts]
-    runs-on: ${{ startsWith(inputs.php-version, '8.4') && 'windows-2022' || 'windows-2019' }}
+    runs-on: ${{ (inputs.php-version > '8.4' || inputs.php-version=='master') && 'windows-2022' || 'windows-2019' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/extension-matrix/config/vs.json b/extension-matrix/config/vs.json
@@ -48,5 +48,11 @@
     "vs": "2022",
     "os": "windows-2022",
     "type": "github-hosted"
+  },
+  "master": {
+    "vs": "2022",
+    "os": "windows-2022",
+    "dev": true,
+    "type": "github-hosted"
   }
 }
diff --git a/extension/BuildPhpExtension/config/vs.json b/extension/BuildPhpExtension/config/vs.json
@@ -8,7 +8,8 @@
     "8.1": "vs16",
     "8.2": "vs16",
     "8.3": "vs16",
-    "8.4": "vs17"
+    "8.4": "vs17",
+    "master": "vs17"
   },
   "vs" : {
     "vc14": {
diff --git a/extension/BuildPhpExtension/private/Get-PhpBuild.ps1 b/extension/BuildPhpExtension/private/Get-PhpBuild.ps1
@@ -20,12 +20,11 @@ function Get-PhpBuild {
         try {
             Add-StepLog "Adding release build for PHP $( $Config.php_version )"
             Add-Type -Assembly "System.IO.Compression.Filesystem"
-            $phpSemver, $baseUrl = $BuildDetails.phpSemver, $BuildDetails.baseUrl
+            $phpSemver, $baseUrl, $fallbackBaseUrl = $BuildDetails.phpSemver, $BuildDetails.baseUrl, $BuildDetails.fallbackBaseUrl
             $tsPart = if ($Config.ts -eq "nts") { "nts-Win32" } else { "Win32" }
             $binZipFile = "php-$phpSemver-$tsPart-$( $Config.vs_version )-$( $Config.arch ).zip"
             $binUrl = "$baseUrl/$binZipFile"
-
-            $fallBackUrl = "$baseUrl/archives/$binZipFile"
+            $fallBackUrl = "$fallbackBaseUrl/$binZipFile"
 
             if ($Config.php_version -lt '7.4') {
                 $fallBackUrl = $fallBackUrl.replace("vc", "VC")
diff --git a/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1 b/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1
@@ -13,25 +13,31 @@ function Get-PhpBuildDetails {
     begin {
     }
     process {
-        foreach($releaseState in @("releases", "qa")) {
-            $baseUrl = "https://downloads.php.net/~windows/$releaseState"
-            $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
-            $releases = Invoke-WebRequest "$baseUrl/releases.json" | ConvertFrom-Json
-            $phpSemver = $releases.$($Config.php_version).version
-            if($null -eq $phpSemver) {
-                $phpSemver = (Invoke-WebRequest $fallbackBaseUrl).Links |
-                        Where-Object { $_.href -match "php-($($Config.php_version).[0-9]+).*" } |
-                        ForEach-Object { $matches[1] } |
-                        Sort-Object { [System.Version]$_ } -Descending |
-                        Select-Object -First 1
-            }
-            if($null -ne $phpSemver) {
-                break
+        if($Config.php_version -eq 'master') {
+            $baseUrl = $fallbackBaseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
+            $PhpSemver = $PhpVersion
+        } else {
+            foreach($releaseState in @("releases", "qa")) {
+                $baseUrl = "https://downloads.php.net/~windows/$releaseState"
+                $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+                $releases = Invoke-WebRequest "$baseUrl/releases.json" | ConvertFrom-Json
+                $phpSemver = $releases.$($Config.php_version).version
+                if($null -eq $phpSemver) {
+                    $phpSemver = (Invoke-WebRequest $fallbackBaseUrl).Links |
+                            Where-Object { $_.href -match "php-($($Config.php_version).[0-9]+).*" } |
+                            ForEach-Object { $matches[1] } |
+                            Sort-Object { [System.Version]$_ } -Descending |
+                            Select-Object -First 1
+                }
+                if($null -ne $phpSemver) {
+                    break
+                }
             }
         }
         return [PSCustomObject]@{
             phpSemver = $phpSemver
             baseUrl = $baseUrl
+            fallbackBaseUrl = $fallbackBaseUrl
         }
     }
     end {
diff --git a/extension/BuildPhpExtension/private/Get-PhpDevelBuild.ps1 b/extension/BuildPhpExtension/private/Get-PhpDevelBuild.ps1
@@ -20,11 +20,11 @@ function Get-PhpDevelBuild {
         try {
             Add-StepLog "Adding developer build for PHP $($Config.php_version)"
             Add-Type -Assembly "System.IO.Compression.Filesystem"
-            $phpSemver, $baseUrl = $BuildDetails.phpSemver, $BuildDetails.baseUrl
+            $phpSemver, $baseUrl, $fallbackBaseUrl = $BuildDetails.phpSemver, $BuildDetails.baseUrl, $BuildDetails.fallbackBaseUrl
             $tsPart = if ($Config.ts -eq "nts") {"nts-Win32"} else {"Win32"}
             $binZipFile = "php-devel-pack-$phpSemver-$tsPart-$($Config.vs_version)-$($Config.arch).zip"
             $binUrl = "$baseUrl/$binZipFile"
-            $fallBackUrl = "$baseUrl/archives/$binZipFile"
+            $fallBackUrl = "$fallbackBaseUrl/$binZipFile"
 
             if($Config.php_version -lt '7.4') {
                 $fallBackUrl = $fallBackUrl.replace("vc", "VC")
diff --git a/extension/BuildPhpExtension/private/Get-PhpSdk.ps1 b/extension/BuildPhpExtension/private/Get-PhpSdk.ps1
@@ -7,7 +7,7 @@ function Get-PhpSdk {
     param (
     )
     begin {
-        $sdkVersion = "2.3.0"
+        $sdkVersion = "2.4.0"
         $url = "https://github.com/php/php-sdk-binary-tools/archive/php-sdk-$sdkVersion.zip"
     }
     process {
diff --git a/extension/BuildPhpExtension/private/Get-VsVersion.ps1 b/extension/BuildPhpExtension/private/Get-VsVersion.ps1
@@ -18,7 +18,7 @@ function Get-VsVersion {
     process {
         $jsonContent = Get-Content -Path $jsonPath -Raw
         $VsConfig = ConvertFrom-Json -InputObject $jsonContent
-        $majorMinor = $PhpVersion.Substring(0, 3)
+        if($PhpVersion -eq 'master') { $majorMinor = 'master'; } else { $majorMinor = $PhpVersion.Substring(0, 3); }
         $VsVersion = $($VsConfig.php.$majorMinor)
         $selectedToolset = $null
         try {
diff --git a/php/BuildPhp/config/vs.json b/php/BuildPhp/config/vs.json
@@ -8,5 +8,6 @@
   "8.1": "vs16",
   "8.2": "vs16",
   "8.3": "vs16",
-  "8.4": "vs17"
+  "8.4": "vs17",
+  "master": "vs17"
 }
diff --git a/php/BuildPhp/private/Get-PhpBuild.ps1 b/php/BuildPhp/private/Get-PhpBuild.ps1
@@ -40,10 +40,13 @@ function Get-PhpBuild {
                 throw "PHP version $PhpVersion is not supported."
             }
         }
-
-        $releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}
-        $baseUrl = "https://downloads.php.net/~windows/$releaseState"
-        $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+        if($PhpVersion -eq 'master') {
+            $fallbackBaseUrl = $baseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
+        } else {
+            $releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}
+            $baseUrl = "https://downloads.php.net/~windows/$releaseState"
+            $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+        }
         $tsPart = if ($Ts -eq "nts") {"nts-Win32"} else {"Win32"}
         $binZipFile = "php-$PhpVersion-$tsPart-$VsVersion-$Arch.zip"
         $binUrl = "$baseUrl/$binZipFile"
diff --git a/php/BuildPhp/private/Get-PhpSdk.ps1 b/php/BuildPhp/private/Get-PhpSdk.ps1
@@ -7,7 +7,7 @@ function Get-PhpSdk {
     param (
     )
     begin {
-        $sdkVersion = "2.3.0"
+        $sdkVersion = "2.4.0"
         $url = "https://github.com/php/php-sdk-binary-tools/archive/php-sdk-$sdkVersion.zip"
     }
     process {
diff --git a/php/BuildPhp/private/Get-PhpSrc.ps1 b/php/BuildPhp/private/Get-PhpSrc.ps1
@@ -22,8 +22,10 @@ function Get-PhpSrc {
         $directory = "php-$PhpVersion-src"
 
         if ($PhpVersion.Contains(".")) {
+            $ref = "php-$PhpVersion"
             $url = "$baseUrl/refs/tags/php-$PhpVersion.zip"
         } else {
+            $ref = $PhpVersion
             $url = "$baseUrl/$PhpVersion.zip"
         }
 
@@ -34,7 +36,7 @@ function Get-PhpSrc {
 
         Invoke-WebRequest $url -Outfile $zipFile
         [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFilePath, $currentDirectory)
-        Rename-Item -Path "php-src-php-$PhpVersion" -NewName $directory
+        Rename-Item -Path "php-src-$ref" -NewName $directory
         [System.IO.Compression.ZipFile]::CreateFromDirectory($directoryPath,  $srcZipFilePath)
     }
     end {
diff --git a/php/BuildPhp/private/Get-PhpTestPack.ps1 b/php/BuildPhp/private/Get-PhpTestPack.ps1
@@ -22,9 +22,13 @@ function Get-PhpTestPack {
     process {
         Add-Type -Assembly "System.IO.Compression.Filesystem"
 
-        $releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}
-        $baseUrl = "https://downloads.php.net/~windows/$releaseState"
-        $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+        if($PhpVersion -eq 'master') {
+            $fallbackBaseUrl = $baseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
+        } else {
+            $releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}
+            $baseUrl = "https://downloads.php.net/~windows/$releaseState"
+            $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+        }
         $testZipFile = "php-test-pack-$PhpVersion.zip"
         $testUrl = "$baseUrl/$testZipFile"
         $fallBackUrl = "$fallbackBaseUrl/$testZipFile"
diff --git a/php/BuildPhp/private/Get-VsVersion.ps1 b/php/BuildPhp/private/Get-VsVersion.ps1
@@ -18,8 +18,8 @@ function Get-VsVersion {
     process {
         $jsonContent = Get-Content -Path $jsonPath -Raw
         $versions = ConvertFrom-Json -InputObject $jsonContent
-        $majorMinor = $PhpVersion.Substring(0, 3)
-        return $($versions.$majorMinor)
+        if($PhpVersion -eq 'master') { $key = 'master'; } else { $key = $PhpVersion.Substring(0, 3); }
+        return $($versions.$key)
     }
     end {
     }

Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,11 @@`
`48`	`48`	`"vs": "2022",`
`49`	`49`	`"os": "windows-2022",`
`50`	`50`	`"type": "github-hosted"`
	`51`	`+ },`
	`52`	`+ "master": {`
	`53`	`+ "vs": "2022",`
	`54`	`+ "os": "windows-2022",`
	`55`	`+ "dev": true,`
	`56`	`+ "type": "github-hosted"`
`51`	`57`	`}`
`52`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ function Get-PhpSdk {`
`7`	`7`	`param (`
`8`	`8`	`)`
`9`	`9`	`begin {`
`10`		`- $sdkVersion = "2.3.0"`
	`10`	`+ $sdkVersion = "2.4.0"`
`11`	`11`	`$url = "https://github.com/php/php-sdk-binary-tools/archive/php-sdk-$sdkVersion.zip"`
`12`	`12`	`}`
`13`	`13`	`process {`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`"8.1": "vs16",`
`9`	`9`	`"8.2": "vs16",`
`10`	`10`	`"8.3": "vs16",`
`11`		`- "8.4": "vs17"`
	`11`	`+ "8.4": "vs17",`
	`12`	`+ "master": "vs17"`
`12`	`13`	`}`