Skip to content

Increase reliability of winget task #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidObando wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Increase reliability of winget task #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions Tasks/git-clone/main.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,22 @@ function InstallPackage{
$process.WaitForExit()
$installExitCode = $process.ExitCode
if ($installExitCode -ne 0) {
Write-Error "Failed to install $PackageId with Install-WinGetPackage, error code $($installExitCode)."
# this was the last try, so exit with the install exit code
exit $installExitCode
if ($PsInstallScope -eq "CurrentUser") {
# try executing the commandlet via Start-Process instead of using Invoke-CimMethod, as this works better in some cases
$process = Start-Process -FilePath "C:\Program Files\PowerShell\7\pwsh.exe" -ArgumentList "-Command $($installPackageCommand)" -PassThru
$handle = $process.Handle # cache process.Handle so ExitCode isn't null when we need it below
$process.WaitForExit()
$installExitCode = $process.ExitCode
if ($installExitCode -ne 0) {
Write-Error "Failed to install package. Exit code: $($installExitCode)."
exit $installExitCode
}
}
else {
Write-Error "Failed to install $PackageId with Install-WinGetPackage, error code $($installExitCode)."
# this was the last try, so exit with the install exit code
exit $installExitCode
}
}

# read the output file and write it to the console
Expand Down
34 changes: 30 additions & 4 deletions Tasks/winget/main.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,21 @@ else {
$process.WaitForExit()
$installExitCode = $process.ExitCode
if ($installExitCode -ne 0) {
Write-Error "Failed to install package. Exit code: $($installExitCode)."
exit 1
if ($PsInstallScope -eq "CurrentUser") {
# try executing the commandlet via Start-Process instead of using Invoke-CimMethod, as this works better in some cases
$process = Start-Process -FilePath "C:\Program Files\PowerShell\7\pwsh.exe" -ArgumentList "-Command $($installPackageCommand)" -PassThru
$handle = $process.Handle # cache process.Handle so ExitCode isn't null when we need it below
$process.WaitForExit()
$installExitCode = $process.ExitCode
if ($installExitCode -ne 0) {
Write-Error "Failed to install package. Exit code: $($installExitCode)."
exit 2
}
}
else {
Write-Error "Failed to install package. Exit code: $($installExitCode)."
exit 1
}
}

# read the output file and write it to the console
Expand Down Expand Up @@ -430,8 +443,21 @@ else {
$process.WaitForExit()
$installExitCode = $process.ExitCode
if ($installExitCode -ne 0) {
Write-Error "Failed to run configuration file installation. Exit code: $($installExitCode)."
exit 1
if ($PsInstallScope -eq "CurrentUser") {
# try executing the commandlet via Start-Process instead of using Invoke-CimMethod, as this works better in some cases
$process = Start-Process -FilePath "C:\Program Files\PowerShell\7\pwsh.exe" -ArgumentList "-Command $($applyConfigCommand)" -PassThru
$handle = $process.Handle # cache process.Handle so ExitCode isn't null when we need it below
$process.WaitForExit()
$installExitCode = $process.ExitCode
if ($installExitCode -ne 0) {
Write-Error "Failed to run configuration file installation. Exit code: $($installExitCode)."
exit 2
}
}
else {
Write-Error "Failed to run configuration file installation. Exit code: $($installExitCode)."
exit 1
}
}

# read the output file and write it to the console
Expand Down
Loading