Merge branch 'noPAT' of https://github.com/freddydk/AL-Go into noPAT

microsoft · Jan 23, 2025 · b4def6d · b4def6d
2 parents ec0c203 + d17fef3
commit b4def6d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/Actions/Deliver/Deliver.ps1 b/Actions/Deliver/Deliver.ps1
@@ -1,6 +1,4 @@
 Param(
-    [Parameter(HelpMessage = "The GitHub actor running the action", Mandatory = $false)]
-    [string] $actor,
     [Parameter(HelpMessage = "The GitHub token running the action", Mandatory = $false)]
     [string] $token,
     [Parameter(HelpMessage = "Projects to deliver (default is all)", Mandatory = $false)]

diff --git a/Actions/Deliver/README.md b/Actions/Deliver/README.md
@@ -16,7 +16,6 @@ Deliver App to deliveryTarget (AppSource, Storage, or...)
 | Name | Required | Description | Default value |
 | :-- | :-: | :-- | :-- |
 | shell | | The shell (powershell or pwsh) in which the PowerShell script in this action should run | powershell |
-| actor | | The GitHub actor running the action | github.actor |
 | token | | The GitHub token running the action | github.token |
 | projects | | Comma-separated list of projects to deliver | * |
 | deliveryTarget | Yes | Delivery target (AppSource, Storage, GitHubPackages,...) | |

diff --git a/Actions/Deliver/action.yaml b/Actions/Deliver/action.yaml
@@ -5,10 +5,6 @@ inputs:
     description: Shell in which you want to run the action (powershell or pwsh)
     required: false
     default: powershell
-  actor:
-    description: The GitHub actor running the action
-    required: false
-    default: ${{ github.actor }}
   token:
     description: The GitHub token running the action
     required: false
@@ -41,7 +37,6 @@ runs:
     - name: run
       shell: ${{ inputs.shell }}
       env:
-        _actor: ${{ inputs.actor }}
         _token: ${{ inputs.token }}
         _projects: ${{ inputs.projects }}
         _deliveryTarget: ${{ inputs.deliveryTarget }}
@@ -51,7 +46,7 @@ runs:
         _goLive: ${{ inputs.goLive }}
       run: |
         ${{ github.action_path }}/../Invoke-AlGoAction.ps1 -ActionName "Deliver" -Action {
-          ${{ github.action_path }}/Deliver.ps1 -actor $ENV:_actor -token $ENV:_token -projects $ENV:_projects -deliveryTarget $ENV:_deliveryTarget -artifacts $ENV:_artifacts -type $ENV:_type -atypes $ENV:_atypes -goLive ($ENV:_goLive -eq 'true')
+          ${{ github.action_path }}/Deliver.ps1 -token $ENV:_token -projects $ENV:_projects -deliveryTarget $ENV:_deliveryTarget -artifacts $ENV:_artifacts -type $ENV:_type -atypes $ENV:_atypes -goLive ($ENV:_goLive -eq 'true')
         }
 branding:
   icon: terminal

diff --git a/Actions/DetermineDeliveryTargets/DetermineDeliveryTargets.ps1 b/Actions/DetermineDeliveryTargets/DetermineDeliveryTargets.ps1
@@ -5,11 +5,11 @@
     [bool] $checkContextSecrets
 )
 
-function ContinuousDelivery([string] $deliveryTarget) {
+function ContinuousDelivery([string] $deliveryTarget, [string[]] $projects) {
     $settingsName = "DeliverTo$deliveryTarget"
     if ($deliveryTarget -eq 'AppSource' -and $settings.type -eq "AppSource App") {
         # For multi-project repositories, ContinuousDelivery can be set on the projects
-        foreach($project in ($projectsJson | ConvertFrom-Json)) {
+        foreach($project in $projects) {
             $projectSettings = ReadSettings -project $project
             if ($projectSettings.deliverToAppSource.ContinuousDelivery -or ($projectSettings.Contains('AppSourceContinuousDelivery') -and $projectSettings.AppSourceContinuousDelivery)) {
                 Write-Host "Project $project is setup for Continuous Delivery to AppSource"
@@ -38,7 +38,7 @@ function IncludeBranch([string] $deliveryTarget) {
     }
 }
 
-function IncludeDeliveryTarget([string] $deliveryTarget) {
+function IncludeDeliveryTarget([string] $deliveryTarget, [string[]] $projects) {
     Write-Host "DeliveryTarget $_"
     # DeliveryTarget Context Secret needs to be specified for a delivery target to be included
     $contextName = "$($_)Context"
@@ -47,7 +47,7 @@ function IncludeDeliveryTarget([string] $deliveryTarget) {
         Write-Host "- Secret '$contextName' not found"
         return $false
     }
-    return (IncludeBranch -deliveryTarget $deliveryTarget) -and (ContinuousDelivery -deliveryTarget $deliveryTarget)
+    return (IncludeBranch -deliveryTarget $deliveryTarget) -and (ContinuousDelivery -deliveryTarget $deliveryTarget -projects $projects)
 }
 
 . (Join-Path -Path $PSScriptRoot -ChildPath "..\AL-Go-Helper.ps1" -Resolve)
@@ -66,7 +66,8 @@ Get-Item -Path (Join-Path $ENV:GITHUB_WORKSPACE ".github/$($namePrefix)*.ps1") |
 $deliveryTargets = @($deliveryTargets | Select-Object -unique)
 if ($checkContextSecrets) {
     # Check all delivery targets and include only the ones needed
-    $deliveryTargets = @($deliveryTargets | Where-Object { IncludeDeliveryTarget -deliveryTarget $_ })
+    $projects = $projectsJson | ConvertFrom-Json
+    $deliveryTargets = @($deliveryTargets | Where-Object { IncludeDeliveryTarget -deliveryTarget $_ -projects $projects })
 }
 $contextSecrets = @($deliveryTargets | ForEach-Object { "$($_)Context" })