Change ARTIFACT_NAMING_SCHEME to env

Author: shivammathur

.github/workflows/pecl.yml

@@ -67,7 +67,6 @@ jobs:
       - name: Build the extension
         uses: ./extension
         with:
-          artifact-naming-scheme: 'pecl'
           extension-url: ${{ inputs.extension-url }}
           extension-ref: ${{ inputs.extension-ref }}
           php-version: ${{ matrix.php-version }}
@@ -78,6 +77,8 @@ jobs:
           build-directory: ${{ inputs.build-directory }}
           run-tests: ${{ inputs.run-tests }}
           test-runner: ${{ inputs.test-runner }}
+        env:
+          artifact-naming-scheme: pecl
 
   artifacts:
     runs-on: ubuntu-latest

extension/BuildPhpExtension/private/Add-Package.ps1

@@ -81,7 +81,9 @@ function Add-Package {
             if(-not(Test-Path -Path "php_$($Config.name).dll")) {
                 throw "Failed to build extension"
             }
-            if($env:ARTIFACT_NAMING_SCHEME -eq 'pie') {
+            if($env:ARTIFACT_NAMING_SCHEME -eq 'pecl') {
+                $artifact = "php_$($Config.package_name)-$($Config.ref.ToLower())-$($Config.php_version)-$($Config.ts)-$($Config.vs_version)-$arch"
+            } else {
                 if($arch -eq 'x64') {
                     $arch = 'x86_64'
                 }
@@ -92,8 +94,6 @@ function Add-Package {
                         Move-Item -Path $_ -Destination "$artifact.$extension" -Force
                     }
                 }
-            } else {
-                $artifact = "php_$($Config.package_name)-$($Config.ref.ToLower())-$($Config.php_version)-$($Config.ts)-$($Config.vs_version)-$arch"
             }
 
             7z a -sdel "$artifact.zip" *

extension/BuildPhpExtension/private/Invoke-Build.ps1

@@ -27,7 +27,7 @@ Function Invoke-Build {
             $builder = "php-sdk\phpsdk-$($Config.vs_version)-$($Config.Arch).bat"
             $task = (Get-Item -Path "." -Verbose).FullName + '\task.bat'
             $ref = $Config.ref
-            if($env:ARTIFACT_NAMING_SCHEME -ne 'pie') {
+            if($env:ARTIFACT_NAMING_SCHEME -eq 'pecl') {
                 $ref = $Config.ref.ToLower()
             }
             $suffix = "php_" + (@(

extension/action.yml

@@ -43,11 +43,6 @@ inputs:
     description: Directory to build the extension in
     required: false
     default: 'build'
-  artifact-naming-scheme:
-    description: Naming schema for the artifacts, pie or pecl
-    deprecationMessage: "This will be removed once pie is released"
-    required: false
-    default: pie
 
 runs:
   using: composite
@@ -60,7 +55,7 @@ runs:
       env:
         CONFIGURE_ARGS: ${{inputs.args}}
         LIBRARIES: ${{inputs.libs}}
-        ARTIFACT_NAMING_SCHEME: ${{inputs.artifact-naming-scheme}}
+        ARTIFACT_NAMING_SCHEME: ${{env.artifact-naming-scheme}}
         RUN_TESTS: ${{inputs.run-tests}}
         TEST_RUNNER: ${{inputs.test-runner}}
         BUILD_DIRECTORY: ${{inputs.build-directory}}