Support release branches that start with "releases/"

Actions/CheckForUpdates/CheckForUpdates.HelperFunctions.ps1

@@ -66,7 +66,7 @@ function ModifyCICDWorkflow {
     }
     # update the branches: line with the new branches
     if ($CICDPushBranches) {
-        $yaml.Replace('on:/push:/branches:', "branches: [ '$($cicdPushBranches -join "', '")' ]")
+        $yaml.Replace('on:/push:/branches:', "branches: [ '$($CICDPushBranches -join "', '")' ]")
     }
     else {
         $yaml.Replace('on:/push:',@())

Actions/CreateReleaseNotes/CreateReleaseNotes.ps1

@@ -23,21 +23,21 @@ try {
     # Check that tag is SemVer
     $SemVerObj = SemVerStrToSemVerObj -semVerStr $tag_name
 
-    # Calculate release branch
-    $releaseBranch = "release/$($SemVerObj.Prefix)$($SemVerObj.Major).$($SemVerObj.Minor)"
+    # Calculate release version
+    $releaseVersion = "$($SemVerObj.Prefix)$($SemVerObj.Major).$($SemVerObj.Minor)"
     if ($SemVerObj.Patch -or $SemVerObj.addt0 -ne 'zzz') {
-        $releaseBranch += ".$($SemVerObj.Patch)"
+        $releaseVersion += ".$($SemVerObj.Patch)"
         if ($SemVerObj.addt0 -ne 'zzz') {
-            $releaseBranch += "-$($SemVerObj.addt0)"
+            $releaseVersion += "-$($SemVerObj.addt0)"
             1..4 | ForEach-Object {
                 if ($SemVerObj."addt$($_)" -ne 'zzz') {
-                    $releaseBranch += ".$($SemVerObj."addt$($_)")"
+                    $releaseVersion += ".$($SemVerObj."addt$($_)")"
                 }
             }
         }
     }
-    Add-Content -Encoding UTF8 -Path $env:GITHUB_OUTPUT -Value "releaseBranch=$releaseBranch"
-    Write-Host "releaseBranch=$releaseBranch"
+    Add-Content -Encoding UTF8 -Path $env:GITHUB_OUTPUT -Value "releaseVersion=$releaseVersion"
+    Write-Host "releaseVersion=$releaseVersion"
 
     $latestRelease = GetLatestRelease -token $token -api_url $ENV:GITHUB_API_URL -repository $ENV:GITHUB_REPOSITORY -ref $ENV:GITHUB_REF_NAME
     if ($latestRelease -and $latestRelease.PSobject.Properties.name -eq "target_commitish") {

Actions/CreateReleaseNotes/README.md

@@ -23,5 +23,5 @@ none
 ### OUTPUT variables
 | Name | Description |
 | :-- | :-- |
-| ReleaseBranch | Name of the release branch |
+| ReleaseVersion | The release version |
 | ReleaseNotes | Release notes generated based on the changes |

Actions/CreateReleaseNotes/action.yaml

@@ -24,9 +24,9 @@ inputs:
     required: false
     default: ''
 outputs:
-  ReleaseBranch:
-    description: Name of the release branch
-    value: ${{ steps.createreleasenotes.outputs.ReleaseBranch }}
+  ReleaseVersion:
+    description: The release version
+    value: ${{ steps.createreleasenotes.outputs.releaseVersion }}
   ReleaseNotes:
     description: Release note generated based on the changes
     value: ${{ steps.createreleasenotes.outputs.ReleaseNotes }}

Actions/Github-Helper.psm1

@@ -532,8 +532,10 @@ function GetLatestRelease {
 
     # Get Latest release
     $latestRelease = $releases | Where-Object { -not ($_.prerelease -or $_.draft) } | Select-Object -First 1
-    $releaseBranchPrefix = 'release/'
-    if ($ref -like "$releaseBranchPrefix*") {
+    $releaseBranchesFormats = 'release/*', 'releases/*'
+    $isReleaseBranch = [boolean] $($releaseBranchesFormats | Where-Object { $ref -like $_ })
+
+    if ($isReleaseBranch) {
         # If release branch, get the latest release from that the release branch
         # This is given by the latest release with the same major.minor as the release branch
         $semVerObj = SemVerStrToSemVerObj -semVerStr $ref.SubString($releaseBranchPrefix.Length) -allowMajorMinorOnly

Actions/ReadSettings/ReadSettings.ps1

@@ -57,7 +57,7 @@ $settings.Keys | ForEach-Object {
     }
     $outSettings += @{ "$setting" = $settingValue }
     if ($getSettings -contains $setting) {
-        if ($settingValue -is [System.Collections.Specialized.OrderedDictionary] -or $settingValue -is [hashtable]) {
+        if ($settingValue -is [System.Collections.Specialized.OrderedDictionary] -or $settingValue -is [hashtable] -or $settingValue -is [array]) {
             Add-Content -Encoding UTF8 -Path $env:GITHUB_ENV -Value "$setting=$(ConvertTo-Json $settingValue -Depth 99 -Compress)"
         }
         else {
@@ -66,6 +66,12 @@ $settings.Keys | ForEach-Object {
     }
 }
 
+# Add default values for settings that are not set
+# CICDPushBranches is not present in the settings object, although it can be set there.
+if('CICDPushBranches' -in $getSettings -and 'CICDPushBranches' -notin $settings.Keys) {
+    Add-Content -Encoding UTF8 -Path $env:GITHUB_ENV -Value "CICDPushBranches=$(Convert-ToJson $defaultCICDPushBranches -Depth 99 -Compress))"
+}
+
 Write-Host "SETTINGS:"
 $outSettings | ConvertTo-Json -Depth 99 | Out-Host
 Add-Content -Encoding UTF8 -Path $env:GITHUB_ENV -Value "Settings=$($outSettings | ConvertTo-Json -Depth 99 -Compress)"

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

@@ -40,6 +40,7 @@ jobs:
       projectDependenciesJson: ${{ steps.determineProjectsToBuild.outputs.ProjectDependenciesJson }}
       buildOrderJson: ${{ steps.determineProjectsToBuild.outputs.BuildOrderJson }}
       workflowDepth: ${{ steps.DetermineWorkflowDepth.outputs.WorkflowDepth }}
+      publishArtifacts: ${{ steps.DeterminePublishArtifacts.outputs.PublishArtifacts }}
     steps:
       - name: Dump Workflow Information
         uses: microsoft/AL-Go-Actions/DumpWorkflowInfo@main
@@ -63,7 +64,7 @@ jobs:
         uses: microsoft/AL-Go-Actions/ReadSettings@main
         with:
           shell: powershell
-          get: type
+          get: type, CICDPushBranches
 
       - name: Determine Workflow Depth
         id: DetermineWorkflowDepth
@@ -113,6 +114,28 @@ jobs:
           getEnvironments: '*'
           type: 'CD'
 
+      - name: Determine Publish Artifacts
+        id: DeterminePublishArtifacts
+        run: |
+          $publishArtifacts = $false
+          $pushBranches = $env:CICDPushBranches | ConvertFrom-Json
+          $currentBranch = $env:GITHUB_REF_NAME
+
+          Write-Host "Current branch: $currentBranch"
+
+          foreach($pushBranch in $pushBranches) {
+            if($currentBranch -like $pushBranch) {
+              $publishArtifacts = $true
+              break
+            }
+          }
+          $deliveryTargets = "${{ steps.DetermineDeliveryTargets.outputs.DeliveryTargetsJson }}" | ConvertFrom-Json
+          $environmentCount = ${{ steps.DetermineDeploymentEnvironments.outputs.EnvironmentCount }}
+
+          $publishArtifacts = $publishArtifacts -or ($deliveryTargets.Count -gt 0) -or ($environmentCount -gt 0)
+          Add-Content -Encoding UTF8 -Path $env:GITHUB_OUTPUT -Value "PublishArtifacts=$publishArtifacts"
+          Write-Host "PublishArtifacts=$publishArtifacts"
+
   CheckForUpdates:
     needs: [ Initialization ]
     runs-on: [ windows-latest ]
@@ -153,7 +176,7 @@ jobs:
       projectDependenciesJson: ${{ needs.Initialization.outputs.projectDependenciesJson }}
       secrets: 'licenseFileUrl,codeSignCertificateUrl,*codeSignCertificatePassword,keyVaultCertificateUrl,*keyVaultCertificatePassword,keyVaultClientId,gitHubPackagesContext,applicationInsightsConnectionString'
       publishThisBuildArtifacts: ${{ needs.Initialization.outputs.workflowDepth > 1 }}
-      publishArtifacts: ${{ github.ref_name == 'main' || startswith(github.ref_name, 'release/') || needs.Initialization.outputs.deliveryTargetsJson != '[]' || needs.Initialization.outputs.environmentCount > 0 }}
+      publishArtifacts: ${{ needs.Initialization.outputs.PublishArtifacts == 'True' }}
       signArtifacts: true
       useArtifactCache: true
 

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

@@ -27,6 +27,10 @@ on:
         description: Create Release Branch?
         type: boolean
         default: false
+      releaseBranchPrefix:
+        description: The preffix for the release branch. Used only if 'Create Release Branch?' is checked.
+        type: string
+        default: release/
       updateVersionNumber:
         description: New Version Number in main branch. Use Major.Minor for absolute change, use +Major.Minor for incremental change.
         required: false
@@ -64,7 +68,7 @@ jobs:
       artifacts: ${{ steps.analyzeartifacts.outputs.artifacts }}
       releaseId: ${{ steps.createrelease.outputs.releaseId }}
       commitish: ${{ steps.analyzeartifacts.outputs.commitish }}
-      releaseBranch: ${{ steps.createreleasenotes.outputs.releaseBranch }}
+      releaseVersion: ${{ steps.createreleasenotes.outputs.releaseVersion }}
     steps:
       - name: Dump Workflow Information
         uses: microsoft/AL-Go-Actions/DumpWorkflowInfo@main
@@ -304,11 +308,13 @@ jobs:
       - name: Create Release Branch
         run: |
           $errorActionPreference = "Stop"; $ProgressPreference = "SilentlyContinue"; Set-StrictMode -Version 2.0
-          git checkout -b ${{ needs.CreateRelease.outputs.releaseBranch }}
+          $releaseBranch = '${{ github.event.inputs.releaseBranchPrefix }}${{ needs.CreateRelease.outputs.releaseVersion }}'
+          Write-Host "Creating release branch $releaseBranch"
+          git checkout -b $releaseBranch
           git config user.name ${{ github.actor}}
           git config user.email ${{ github.actor}}@users.noreply.github.com
-          git commit --allow-empty -m "Release branch ${{ needs.CreateRelease.outputs.releaseBranch }}"
-          git push origin ${{ needs.CreateRelease.outputs.releaseBranch }}
+          git commit --allow-empty -m "Release branch $releaseBranch"
+          git push origin $releaseBranch
 
   UpdateVersionNumber:
     needs: [ CreateRelease, UploadArtifacts ]

Tests/CreateReleaseNotes.Test.ps1

@@ -31,7 +31,7 @@ Describe 'CreateReleaseNotes Tests' {
             "pull-requests" = "write"
         }
         $outputs = [ordered]@{
-            "ReleaseBranch" = "Name of the release branch"
+            "ReleaseVersion" = "The release version"
             "ReleaseNotes" = "Release note generated based on the changes"
         }
         YamlTest -scriptRoot $scriptRoot -actionName $actionName -actionScript $actionScript -permissions $permissions -outputs $outputs