Fix release path and artifact name

Author: AlexNDRmac

.ci/build-win32.bat

@@ -29,25 +29,26 @@ function InitializeReleaseVars {
             Configures Environment variables for Release build.
     #>
 
-    if ($env:BUILD_TYPE -Match "nts") {
-        $env:RELEASE_ZIPBALL = "zephir_parser_${env:PHP_ARCH}_vc${env:VC_VERSION}_php${env:PHP_MINOR}_nts"
-
-        if ($env:PHP_ARCH -eq 'x86') {
-            $env:RELEASE_FOLDER = "x64\Release"
-        } else {
-            $env:RELEASE_FOLDER = "x64\Release"
-        }
-    } else {
-        $env:RELEASE_ZIPBALL = "zephir_parser_${env:PHP_ARCH}_vc${env:VC_VERSION}_php${env:PHP_MINOR}"
-
-        if ($env:PHP_ARCH -eq 'x86') {
-            $env:RELEASE_FOLDER = "x64\Release_TS"
-        } else {
-            $env:RELEASE_FOLDER = "x64\Release_TS"
-        }
+    # All extension builds should respect next logic for build artifacts
+    #
+    # release
+    # |---- x64
+    # |     |---- ts  / php_zephir_parser.dll
+    # |     |---- nts / php_zephir_parser.dll
+    # |---- x86
+    # |     |---- ts  / php_zephir_parser.dll
+    # |     |---- nts / php_zephir_parser.dll
+    #
+    # Build artifacts should be names like this:
+    # zephir-parser-php-7.0-nts-Win32-VC14-x86.zip
+    # zephir-parser-php-7.0-ts-Win32-VC14-x64.zip
+    $VC_Prefix = "VC"
+    if (${env:VC_VERSION} -ge 16) {
+        $VC_Prefix = "VS"
     }
 
-    $env:RELEASE_DLL_PATH = "${env:GITHUB_WORKSPACE}\${env:RELEASE_FOLDER}\${env:EXTENSION_FILE}"
+    $env:RELEASE_DLL_PATH = "${env:GITHUB_WORKSPACE}\${env:RELEASE_FOLDER}\${ArchPrefix}\${ThreadSafetyPrefix}\${env:EXTENSION_FILE}"
+    $env:RELEASE_ZIPBALL = "zephir-parser-php-${env:PHP_MINOR}-${env:BUILD_TYPE}-Win32-${VC_Prefix}${env:VC_VERSION}-${env:PHP_ARCH}"
 
     Write-Output "RELEASE_ZIPBALL=${env:RELEASE_ZIPBALL}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     Write-Output "RELEASE_DLL_PATH=${env:RELEASE_DLL_PATH}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

.ci/win-ci-tools.psm1

@@ -11,7 +11,7 @@ indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
 
-[*.{yml,m4,sh,md,php,phpt,xml,json,w32}]
+[*.{yml,m4,sh,md,php,phpt,xml,json,w32,ps1,psm1}]
 indent_style = space
 
 [*.{yml,m4,sh}]

.editorconfig

@@ -63,7 +63,7 @@ jobs:
           - php: '8.0'
             vc_num: 15
 
-    name: "Win ${{ matrix.arch }} VC${{ matrix.vc_num }} and PHP ${{ matrix.php }}-${{ matrix.build_type }}"
+    name: "PHP-${{ matrix.php }}-${{ matrix.build_type }}-Win32-VC${{ matrix.vc_num }}-${{ matrix.arch }}"
     runs-on: windows-2016
 
     steps:
@@ -94,6 +94,7 @@ jobs:
           Import-Module .\.ci\win-ci-tools.psm1
           SetupCommonEnvironment
 
+      # TODO: Use cache for PHP SDK and build tools
       - name: Install PHP SDK Binary Tools
         run: |
           Import-Module .\.ci\win-ci-tools.psm1
@@ -126,12 +127,14 @@ jobs:
           call C:\tools\php-sdk\bin\phpsdk_setvars.bat
           call C:\tools\php-devpack\phpize.bat
 
+      - name: Configure
       - shell: cmd
         run: |
           call C:\tools\php-sdk\phpsdk-vc${{ matrix.vc_num }}-${{ matrix.arch }}.bat
           call C:\tools\php-sdk\bin\phpsdk_setvars.bat
           configure --with-codegen-arch=yes --with-prefix=C:\php --with-php-build=C:\php-devpack --disable-all --enable-zephir-parser=shared
 
+      - name: Compile
       - shell: cmd
         run: |
           call C:\tools\php-sdk\phpsdk-vc${{ matrix.vc_num }}-${{ matrix.arch }}.bat