diff options
author | Mario Loriedo <mario.loriedo@gmail.com> | 2024-07-18 11:06:41 +0200 |
---|---|---|
committer | Mario Loriedo <mario.loriedo@gmail.com> | 2024-07-18 16:56:39 +0200 |
commit | 2e4b640ad21187c345b9e17107b94a306c25a3aa (patch) | |
tree | 3e081088b2eb1e533074468c0fc69ab8c3b9c13b /winmake.ps1 | |
parent | eecdba40093b78977e7b0bd275052c147a5f8957 (diff) |
Fix windows installer deleting machine provider config file
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
Diffstat (limited to 'winmake.ps1')
-rw-r--r-- | winmake.ps1 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/winmake.ps1 b/winmake.ps1 index 3a24541f0..efb0170a2 100644 --- a/winmake.ps1 +++ b/winmake.ps1 @@ -114,12 +114,9 @@ function Test-Installer{ } $command = "$PSScriptRoot\contrib\win-installer\test-installer.ps1" - $command += " -operation all" + $command += " -scenario all" $command += " -provider $provider" $command += " -setupExePath $setupExePath" - $command += " -installWSL:`$false" - $command += " -installHyperV:`$false" - $command += " -skipWinVersionCheck:`$true" Run-Command "${command}" } @@ -205,7 +202,7 @@ function Build-Ginkgo{ function Git-Commit{ # git is not installed by default on windows, # so if we can't get the commit, we don't include this info - Get-Command git -ErrorAction SilentlyContinue | out-null + Get-Command git -ErrorAction SilentlyContinue | out-null if(!$?){ return } @@ -285,7 +282,11 @@ switch ($target) { Win-SSHProxy -Ref $ref } 'installer' { - Installer + if ($args.Count -gt 1) { + Installer -version $args[1] + } else { + Installer + } } 'installertest' { if ($args.Count -gt 1) { |