Fix artifact setup in test job in php workflow

Author: shivammathur

.github/workflows/php.yml

@@ -38,7 +38,7 @@ jobs:
       artifact-id: ${{ steps.artifacts.outputs.artifact-id }}
     steps:
       - name: Upload artifacts
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v5
         id: artifacts
         with:
           name: artifacts
@@ -68,6 +68,7 @@ jobs:
 
       - name: Test PHP
         shell: pwsh
+        continue-on-error: true
         run: |
           Import-Module (Join-Path $(pwd).Path '\php\BuildPhp') -Force          
           Invoke-PhpTests -PhpVersion ${{inputs.php-version}} `
@@ -76,7 +77,8 @@ jobs:
                           -Opcache ${{matrix.opcache}}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
+        continue-on-error: true
         with:
           name: test-results-${{matrix.arch}}-${{matrix.ts}}-${{matrix.opcache}}
           path: test-${{matrix.arch}}-${{matrix.ts}}-${{matrix.opcache}}.xml

php/BuildPhp/private/Add-TestRequirements.ps1

@@ -40,20 +40,34 @@ function Add-TestRequirements {
     begin {
     }
     process {
+        Add-Type -Assembly "System.IO.Compression.Filesystem"
         $versionInUrl = $PhpVersion
         if($PhpVersion -eq 'master') {
             $versionInUrl = "master"
         }
         $tsPart = if ($Ts -eq "nts") {"nts-Win32"} else {"Win32"}
         $binZipFile = "php-$versionInUrl-$tsPart-$VsVersion-$Arch.zip"
         $testZipFile = "php-test-pack-$versionInUrl.zip"
-        if(-not(Test-Path "$ArtifactsDirectory\$binZipFile")) {
+
+        $currentDirectory = (Get-Location).Path
+        $binZipFilePath = Join-Path $ArtifactsDirectory $binZipFile
+        $binDirectoryPath = Join-Path $currentDirectory phpbin
+
+        $testZipFilePath = Join-Path $ArtifactsDirectory $testZipFile
+        $testsDirectoryPath = Join-Path $currentDirectory $TestsDirectory
+
+        if(-not(Test-Path $binZipFilePath)) {
             Write-Host "Downloading PHP build $binZipFile..."
             Get-PhpBuild -PhpVersion $PhpVersion -Arch $Arch -Ts $Ts -VsVersion $VsVersion
+        } else {
+            [System.IO.Compression.ZipFile]::ExtractToDirectory($binZipFilePath, $binDirectoryPath)
         }
-        if(-not(Test-Path "$ArtifactsDirectory\$testZipFile")) {
+
+        if(-not(Test-Path $testZipFilePath)) {
             Write-Host "Downloading PHP test pack $testZipFile..."
             Get-PhpTestPack -PhpVersion $PhpVersion -TestsDirectory $TestsDirectory
+        } else {
+            [System.IO.Compression.ZipFile]::ExtractToDirectory($testZipFilePath, $testsDirectoryPath)
         }
     }
     end {

php/BuildPhp/public/Invoke-PhpTests.ps1

@@ -40,6 +40,8 @@ function Invoke-PhpTests {
 
         $currentDirectory = (Get-Location).Path
 
+        Get-ChildItem $currentDirectory
+
         $tempDirectory = [System.IO.Path]::GetTempPath()
 
         $buildDirectory = [System.IO.Path]::Combine($tempDirectory, [System.Guid]::NewGuid().ToString())
@@ -52,7 +54,7 @@ function Invoke-PhpTests {
 
         Set-Location "$buildDirectory"
 
-        Add-TestRequirements -PhpVersion $PhpVersion -Arch $Arch -Ts $Ts -VsVersion $VsData.vs -TestsDirectory $testsDirectory -ArtifactsDirectory $currentDirectory\artifacts
+        Add-TestRequirements -PhpVersion $PhpVersion -Arch $Arch -Ts $Ts -VsVersion $VsData.vs -TestsDirectory $testsDirectory -ArtifactsDirectory $currentDirectory
 
         Set-PhpIniForTests -BuildDirectory $buildDirectory -Opcache $Opcache
 

php/action.yml

@@ -32,7 +32,7 @@ runs:
                         -Ts ${{inputs.ts}}
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: artifacts-${{inputs.php-version}}-${{inputs.arch}}-${{inputs.ts}}
         path: artifacts/*