fixup! wip: ci

Author: kjdev

.github/extension/BuildPhpExtension/private/Get-VsVersion.ps1

@@ -21,16 +21,16 @@ function Get-VsVersion {
         if($PhpVersion -eq 'master') { $majorMinor = 'master'; } else { $majorMinor = $PhpVersion.Substring(0, 3); }
         $VsVersion = $($VsConfig.php.$majorMinor)
         $selectedToolset = $null
-
-        Add-StepLog "Visual Studio components version: $VsVersion"
-        Add-StepLog "Visual Studio components config: $VsConfig"
-
         try {
             $selectedToolset = Get-VsVersionHelper -VsVersion $VsVersion -VsConfig $VsConfig
         } catch {
             Add-Vs -VsVersion $VsVersion -VsConfig $VsConfig
             $selectedToolset = Get-VsVersionHelper -VsVersion $VsVersion -VsConfig $VsConfig
         }
+        Add-StepLog "Visual Studio components version: $VsVersion"
+        Add-StepLog "Visual Studio components config: $VsConfig"
+        Add-StepLog "Visual Studio components toolset: $selectedToolset"
+
         return [PSCustomObject]@{
             vs = $VsVersion
             toolset = $selectedToolset

.github/extension/BuildPhpExtension/private/Invoke-Build.ps1

@@ -21,6 +21,7 @@ Function Invoke-Build {
             ls "$((Get-Location).Path)"
             echo ">>> $((Get-Location).Path)\lz4"
             ls "$((Get-Location).Path)\lz4"
+            msbuild -version
 
             $builder = "php-sdk\phpsdk-starter.bat"
             $task = [System.IO.Path]::Combine($PSScriptRoot, '..\config\task.bat')

.github/extension/action.yml

@@ -81,8 +81,8 @@ runs:
                                  -Arch ${{inputs.arch}} `
                                  -Ts ${{inputs.ts}}
 
-    - name: Upload the build artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ steps.build.outputs.artifact }}
-        path: artifacts/*
+    # - name: Upload the build artifact
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: ${{ steps.build.outputs.artifact }}
+    #     path: artifacts/*

.github/workflows/win.yaml

@@ -80,20 +80,34 @@ jobs:
   #         release: ${{ github.event.release.tag_name }}
   #         token: ${{ secrets.GITHUB_TOKEN }}
 
-  msbuild:
+  test:
     runs-on: windows-2022
     steps:
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
-      - run: |
-          msbuild -version
-
-  msbuild_16:
-    runs-on: windows-2022
-    steps:
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          vs-version: '16'
-      - run: |
+          persist-credentials: false
+      - name: Checkout submodule
+        run: .\.github\workflows\submodule.ps1
+        shell: pwsh
+      - env:
+          PHP_VERSION: 8.1
+        run: |
+          Import-Module ${{ github.action_path }}\BuildPhpExtension -Force
+          $VsData = (Get-VsVersion -PhpVersion $env:PHP_VERSION)
+          if($null -eq $VsData.vs) {
+            throw "PHP version $PhpVersion is not supported."
+          }
+          Add-BuildLog "vs:$VsData.vs"
           msbuild -version
+        shell: pwsh
+
+  # msbuild_16:
+  #   runs-on: windows-2022
+  #   steps:
+  #     - name: Add msbuild to PATH
+  #       uses: microsoft/setup-msbuild@v2
+  #       with:
+  #         vs-version: '16'
+  #     - run: |
+  #         msbuild -version