fix: only deliver artifact with same type as artifact to upload as release artifact

RELEASENOTES.md

@@ -8,6 +8,7 @@ Workspace compilation now finds altool both in the platform-specific subfolder (
 - Fix "filename or extension is too long" error when validating settings on PS5.1 with large settings JSON
 - Retry downloading dependency artifacts from the current build up to 3 times (30 seconds between attempts) to tolerate transient network errors such as "Failed to GetSignedArtifactURL: Unable to make request: ETIMEDOUT"
 - Issue 2302 - AlDoc does not use --packagecache when building reference documentation
+- Issue 2320 - Deliver to NuGet of release workflow failing with app and test app
 
 ## v9.1
 

Templates/AppSource App/.github/workflows/CreateRelease.yaml

@@ -239,9 +239,26 @@ jobs:
               data: fs.readFileSync(assetPath)
             });
 
+      - name: Determine delivery targets
+        id: determineDeliveryTargets
+        env:
+          hasNuGetContext: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).nuGetContext != '' }}
+          hasStorageContext: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).storageContext != '' }}
+          MATRIX_ATYPE: ${{ matrix.atype }}
+        run: |
+          $errorActionPreference = "Stop"; $ProgressPreference = "SilentlyContinue"; Set-StrictMode -Version 2.0
+
+          $deliverToNuGet = $env:hasNuGetContext -eq 'true' -and $env:MATRIX_ATYPE -in @("Apps", "TestApps")
+          Write-Host "Deliver $($env:MATRIX_ATYPE) to NuGet: $deliverToNuGet"
+          Add-Content -Encoding UTF8 -Path $env:GITHUB_OUTPUT -Value "deliverToNuGet=$($deliverToNuGet.ToString().ToLower())"
+
+          $deliverToStorage = $env:hasStorageContext -eq 'true' -and $env:MATRIX_ATYPE -in @("Apps", "TestApps", "Dependencies")
+          Write-Host "Deliver $($env:MATRIX_ATYPE) to Storage: $deliverToStorage"
+          Add-Content -Encoding UTF8 -Path $env:GITHUB_OUTPUT -Value "deliverToStorage=$($deliverToStorage.ToString().ToLower())"
+
       - name: Deliver to NuGet
         uses: microsoft/AL-Go-Actions/Deliver@main
-        if: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).nuGetContext != '' }}
+        if: ${{ steps.determineDeliveryTargets.outputs.deliverToNuGet == 'true' }}
         env:
           Secrets: '${{ steps.ReadSecrets.outputs.Secrets }}'
         with:
@@ -250,11 +267,11 @@ jobs:
           projects: ${{ matrix.project }}
           deliveryTarget: 'NuGet'
           artifacts: ${{ github.event.inputs.buildVersion }}
-          atypes: 'Apps,TestApps'
+          atypes: ${{ matrix.atype }}
 
       - name: Deliver to Storage
         uses: microsoft/AL-Go-Actions/Deliver@main
-        if: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).storageContext != '' }}
+        if: ${{ steps.determineDeliveryTargets.outputs.deliverToStorage == 'true' }}
         env:
           Secrets: '${{ steps.ReadSecrets.outputs.Secrets }}'
         with:
@@ -263,7 +280,7 @@ jobs:
           projects: ${{ matrix.project }}
           deliveryTarget: 'Storage'
           artifacts: ${{ github.event.inputs.buildVersion }}
-          atypes: 'Apps,TestApps,Dependencies'
+          atypes: ${{ matrix.atype }}
 
   CreateReleaseBranch:
     needs: [ CreateRelease, UploadArtifacts ]

Templates/Per Tenant Extension/.github/workflows/CreateRelease.yaml

@@ -239,9 +239,26 @@ jobs:
               data: fs.readFileSync(assetPath)
             });
 
+      - name: Determine delivery targets
+        id: determineDeliveryTargets
+        env:
+          hasNuGetContext: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).nuGetContext != '' }}
+          hasStorageContext: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).storageContext != '' }}
+          MATRIX_ATYPE: ${{ matrix.atype }}
+        run: |
+          $errorActionPreference = "Stop"; $ProgressPreference = "SilentlyContinue"; Set-StrictMode -Version 2.0
+
+          $deliverToNuGet = $env:hasNuGetContext -eq 'true' -and $env:MATRIX_ATYPE -in @("Apps", "TestApps")
+          Write-Host "Deliver $($env:MATRIX_ATYPE) to NuGet: $deliverToNuGet"
+          Add-Content -Encoding UTF8 -Path $env:GITHUB_OUTPUT -Value "deliverToNuGet=$($deliverToNuGet.ToString().ToLower())"
+
+          $deliverToStorage = $env:hasStorageContext -eq 'true' -and $env:MATRIX_ATYPE -in @("Apps", "TestApps", "Dependencies")
+          Write-Host "Deliver $($env:MATRIX_ATYPE) to Storage: $deliverToStorage"
+          Add-Content -Encoding UTF8 -Path $env:GITHUB_OUTPUT -Value "deliverToStorage=$($deliverToStorage.ToString().ToLower())"
+
       - name: Deliver to NuGet
         uses: microsoft/AL-Go-Actions/Deliver@main
-        if: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).nuGetContext != '' }}
+        if: ${{ steps.determineDeliveryTargets.outputs.deliverToNuGet == 'true' }}
         env:
           Secrets: '${{ steps.ReadSecrets.outputs.Secrets }}'
         with:
@@ -250,11 +267,11 @@ jobs:
           projects: ${{ matrix.project }}
           deliveryTarget: 'NuGet'
           artifacts: ${{ github.event.inputs.buildVersion }}
-          atypes: 'Apps,TestApps'
+          atypes: ${{ matrix.atype }}
 
       - name: Deliver to Storage
         uses: microsoft/AL-Go-Actions/Deliver@main
-        if: ${{ fromJson(steps.ReadSecrets.outputs.Secrets).storageContext != '' }}
+        if: ${{ steps.determineDeliveryTargets.outputs.deliverToStorage == 'true' }}
         env:
           Secrets: '${{ steps.ReadSecrets.outputs.Secrets }}'
         with:
@@ -263,7 +280,7 @@ jobs:
           projects: ${{ matrix.project }}
           deliveryTarget: 'Storage'
           artifacts: ${{ github.event.inputs.buildVersion }}
-          atypes: 'Apps,TestApps,Dependencies'
+          atypes: ${{ matrix.atype }}
 
   CreateReleaseBranch:
     needs: [ CreateRelease, UploadArtifacts ]