From e1db7df56443fe86e6c0447373ca613cbfc474e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 9 Jun 2024 21:36:59 +0200 Subject: [PATCH] fix: correct TEST_DEBUG retrieval from build.ps1 --- build.ps1 | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/build.ps1 b/build.ps1 index 474327ae..2d06a5af 100644 --- a/build.ps1 +++ b/build.ps1 @@ -19,11 +19,8 @@ $Repository = 'ssh-agent' $Organisation = 'jenkins' $ImageType = 'windows-ltsc2019' -$baseDockerCmd = 'docker-compose --file=build-windows.yaml' -$baseDockerBuildCmd = '{0} build --parallel --pull' -f $baseDockerCmd - if(![String]::IsNullOrWhiteSpace($env:TESTS_DEBUG)) { - $ImageType = $env:IMAGE_TYPE + $TestsDebug = $env:TESTS_DEBUG } $env:TESTS_DEBUG = $TestsDebug @@ -84,10 +81,10 @@ function Test-Image { $ImageNameAndJavaVersion ) - $items = $ImageNameAndJavaVersion.Split("|") + $items = $ImageNameAndJavaVersion.Split('|') $imageName = $items[0] $javaVersion = $items[1] - $imageNameItems = $imageName.Split(":") + $imageNameItems = $imageName.Split(':') $imageTag = $imageNameItems[1] Write-Host "= TEST: Testing ${ImageName} image" @@ -119,15 +116,15 @@ function Test-Image { $baseDockerCmd = 'docker-compose --file=build-windows.yaml' $baseDockerBuildCmd = '{0} build --parallel --pull' -f $baseDockerCmd -Write-Host "= PREPARE: List of $Organisation/$env:DOCKERHUB_REPO images and tags to be processed:" +Write-Host "= PREPARE: List of images and tags to be processed:" Invoke-Expression "$baseDockerCmd config" Write-Host '= BUILD: Building all images...' - switch ($DryRun) { - $true { Write-Host "(dry-run) $baseDockerBuildCmd" } - $false { Invoke-Expression $baseDockerBuildCmd } - } - Write-Host '= BUILD: Finished building all images.' +switch ($DryRun) { + $true { Write-Host "(dry-run) $baseDockerBuildCmd" } + $false { Invoke-Expression $baseDockerBuildCmd } +} +Write-Host '= BUILD: Finished building all images.' if($lastExitCode -ne 0) { exit $lastExitCode