Skip to content
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

Jump to bottom

Speedup CI by bootstrapping PowerShell module installations in background and in parallel, whilst the .NET SDK is being installed #1634

Merged
merged 13 commits into from
Apr 21, 2021
Merged

Speedup CI by bootstrapping PowerShell module installations in background and in parallel, whilst the .NET SDK is being installed #1634

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6c84d23
Bootstrap dependencies in parallel in CI
bergmeister Jan 24, 2021
2556a3c
fix syntax
bergmeister Jan 24, 2021
5eceb86
fix function scope
bergmeister Jan 24, 2021
c322aae
using for psscriptroot
bergmeister Jan 24, 2021
e64de8e
add debugging statements
bergmeister Jan 24, 2021
584e8f6
add more logging and try fix wmf param ayntax
bergmeister Jan 24, 2021
f20bf3e
try fix wmf syntax
bergmeister Jan 24, 2021
a3b4154
try simplify
bergmeister Jan 24, 2021
8a52f3b
set env outside psjob
bergmeister Jan 24, 2021
5ffd45a
only do psmodules as jobs
bergmeister Jan 24, 2021
0d5f765
fix and shallow fetch
bergmeister Jan 24, 2021
32537f5
shallow fetch for tests as well
bergmeister Jan 24, 2021
3fe37c6
undo shallow fetch as it made no difference
bergmeister Jan 24, 2021
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
31 changes: 22 additions & 9 deletions tools/appveyor.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function Install-Pester {
Write-Verbose -Verbose "Installing Pester via Install-Module"
Install-Module -Name Pester -Force -SkipPublisherCheck -Scope CurrentUser -Repository PSGallery
}
Write-Verbose -Verbose 'Installed Pester'
}
}

Expand All @@ -27,16 +28,20 @@ function Invoke-AppVeyorInstall {
[switch] $SkipPesterInstallation
)

if (-not $SkipPesterInstallation.IsPresent) { Install-Pester }
$installPowerShellModulesjobs = @()
if (-not $SkipPesterInstallation.IsPresent) { $installPowerShellModulesjobs += Start-Job ${Function:Install-Pester} }

if ($null -eq (Get-Module -ListAvailable PowershellGet)) {
# WMF 4 image build
Write-Verbose -Verbose "Installing platyPS via nuget"
nuget install platyPS -source https://www.powershellgallery.com/api/v2 -outputDirectory "$Env:ProgramFiles\WindowsPowerShell\Modules\." -ExcludeVersion
}
else {
Write-Verbose -Verbose "Installing platyPS via Install-Module"
Install-Module -Name platyPS -Force -Scope CurrentUser -Repository PSGallery
$installPowerShellModulesjobs += Start-Job {
if ($null -eq (Get-Module -ListAvailable PowershellGet)) {
# WMF 4 image build
Write-Verbose -Verbose "Installing platyPS via nuget"
nuget install platyPS -source https://www.powershellgallery.com/api/v2 -outputDirectory "$Env:ProgramFiles\WindowsPowerShell\Modules\." -ExcludeVersion
}
else {
Write-Verbose -Verbose "Installing platyPS via Install-Module"
Install-Module -Name platyPS -Force -Scope CurrentUser -Repository PSGallery
}
Write-Verbose -Verbose 'Installed platyPS'
}

# Do not use 'build.ps1 -bootstrap' option for bootstraping the .Net SDK as it does not work well in CI with the AppVeyor Ubuntu image
Expand Down Expand Up @@ -70,6 +75,14 @@ function Invoke-AppVeyorInstall {
[Net.ServicePointManager]::SecurityProtocol = $originalSecurityProtocol
Remove-Item .\dotnet-install.*
}
Write-Verbose -Verbose 'Installed required .Net CORE SDK'
}

Wait-Job $installPowerShellModulesjobs | Receive-Job
$installPowerShellModulesjobs | ForEach-Object {
if ($_.State -eq 'Failed') {
throw 'Installing PowerShell modules failed, see job logs above'
}
}
}

Expand Down