Skip to content

Commit ade72ea

Browse files
authored
3 bugs in v6.4 (#1523)
Do not remove downloaded apps from PR builds, they might be needed by other projects being built. Fixes #1521 and Remove unnecessary warnings from deployment Fixes #1522 and if settings.workflowSchedule doesn't exist - Update AL-Go System files fails when running on a schedule Fixes #1524 --------- Co-authored-by: freddydk <[email protected]>
1 parent 4136944 commit ade72ea

File tree

3 files changed

+11
-32
lines changed

3 files changed

+11
-32
lines changed

Actions/Deploy/Deploy.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ function CheckIfAppNeedsInstallOrUpgrade {
2020
$needsInstall = $false
2121
$needsUpgrade = $false
2222
if ($installedApp) {
23-
$newVersion = [version]::new($appJson.Version)
23+
$dependencyVersion = [version]::new($appJson.Version)
2424
$installedVersion = [version]::new($installedApp.versionMajor, $installedApp.versionMinor, $installedApp.versionBuild, $installedApp.versionRevision)
25-
if ($newVersion -gt $installedVersion) {
26-
$msg = "Dependency app $($appJson.name) is already installed in version $installedVersion, which is lower than $newVersion."
25+
if ($dependencyVersion -gt $installedVersion) {
26+
$msg = "Dependency app $($appJson.name) is already installed in version $installedVersion, which is lower than $dependencyVersion."
2727
if ($installMode -eq 'upgrade') {
2828
Write-Host "$msg Needs upgrade."
2929
$needsUpgrade = $true
@@ -32,8 +32,8 @@ function CheckIfAppNeedsInstallOrUpgrade {
3232
Write-Host "::WARNING::$msg Set DependencyInstallMode to 'upgrade' or 'forceUpgrade' to upgrade dependencies."
3333
}
3434
}
35-
elseif ($newVersion -lt $installedVersion) {
36-
Write-Host "::WARNING::Dependency app $($appJson.name) is already installed in version $installedVersion, which is higher than $newVersion, used for this build. Please update your local copy of this dependency."
35+
elseif ($dependencyVersion -lt $installedVersion) {
36+
Write-Host "Dependency app $($appJson.name) is already installed in version $installedVersion, which is higher than $dependencyVersion, used in app.json."
3737
}
3838
else {
3939
Write-Host "Dependency app $($appJson.name) is already installed in version $installedVersion."
@@ -216,7 +216,7 @@ if (Test-Path $artifactsFolder -PathType Container) {
216216
else {
217217
$allApps += $projectApps
218218
}
219-
if (!($projectTestApps)) {
219+
if ($deploymentSettings.includeTestAppsInSandboxEnvironment -and !($projectTestApps)) {
220220
if ($project -ne '*') {
221221
Write-Host "::warning::There are no artifacts present in $artifactsFolder matching $project-$refname-$($buildMode)TestApps-<version>."
222222
}
@@ -259,7 +259,7 @@ else {
259259

260260
# Calculate unknown dependencies for all apps and known dependencies
261261
$unknownDependencies = @()
262-
Sort-AppFilesByDependencies -appFiles @($apps + $dependencies) -unknownDependencies ([ref]$unknownDependencies) | Out-Null
262+
Sort-AppFilesByDependencies -appFiles @($apps + $dependencies) -unknownDependencies ([ref]$unknownDependencies) -WarningAction SilentlyContinue | Out-Null
263263

264264
Write-Host "Apps to deploy"
265265
$apps | ForEach-Object {

Actions/GetWorkflowMultiRunBranches/GetWorkflowMultiRunBranches.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ switch ($env:GITHUB_EVENT_NAME) {
1212
$settings = ConvertFrom-Json $env:settings
1313

1414
# Add defensive check to handle if workflowSchedule.includeBranches is not defined in settings
15-
if (-not $($settings.workflowSchedule.includeBranches)) {
15+
if (($settings.PSObject.Properties.Name -eq "workflowSchedule") -and ($settings.workflowSchedule.PSObject.Properties.Name -eq "includeBranches") -and $($settings.workflowSchedule.includeBranches)) {
16+
$branchPatterns = @($($settings.workflowSchedule.includeBranches))
17+
}
18+
else {
1619
Write-Host "No branch patterns defined in settings"
1720
$branchPatterns = @()
18-
} else {
19-
$branchPatterns = @($($settings.workflowSchedule.includeBranches))
2021
}
2122
}
2223
'workflow_dispatch' {

Actions/RunPipeline/RunPipeline.ps1

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -509,28 +509,6 @@ try {
509509
-appBuild $appBuild -appRevision $appRevision `
510510
-uninstallRemovedApps
511511

512-
# If any apps were downloaded as part of incremental builds in a pr, we should remove them again after the build to prevent them from being included in artifacts
513-
if ($ENV:GITHUB_EVENT_NAME -like 'pull_request*' -and $downloadedAppsByType) {
514-
$downloadedAppsByType | ForEach-Object {
515-
if ($_.downloadedApps) {
516-
$mask = $_.mask
517-
$thisArtifactFolder = Join-Path $buildArtifactFolder $mask
518-
Write-Host "Removing pre-built apps from $thisArtifactFolder"
519-
foreach($downloadedApp in $_.downloadedApps) {
520-
$thisApp = Join-Path $thisArtifactFolder $downloadedApp
521-
try {
522-
if (Test-Path $thisApp) {
523-
Remove-Item $thisApp
524-
}
525-
Write-Host "Removed pre-built app: $thisApp"
526-
} catch {
527-
Write-Host "Failed to remove pre-built app: $thisApp"
528-
}
529-
}
530-
}
531-
}
532-
}
533-
534512
if ($containerBaseFolder) {
535513
Write-Host "Copy artifacts and build output back from build container"
536514
$destFolder = Join-Path $ENV:GITHUB_WORKSPACE $project

0 commit comments

Comments
 (0)