Skip to content

Make '-CI' not depend on '-PSModuleRestore' in 'Start-PSBuild' #6450

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

Merged
daxian-dbw merged 2 commits into from
Mar 21, 2018
Merged

Make '-CI' not depend on '-PSModuleRestore' in 'Start-PSBuild' #6450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7866cfd
Make '-CI' not depend on '-PSModuleRestore' in 'Start-PSBuild'
daxian-dbw Mar 21, 2018
0c66b19
Remove '-CI' from 'Restore-PSModuleToBuild'
daxian-dbw Mar 21, 2018
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
22 changes: 8 additions & 14 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,9 +635,13 @@ Fix steps:

# download modules from powershell gallery.
# - PowerShellGet, PackageManagement, Microsoft.PowerShell.Archive
if($PSModuleRestore)
{
Restore-PSModuleToBuild -PublishPath $publishPath -CI:$CI.IsPresent
if ($PSModuleRestore) {
Restore-PSModuleToBuild -PublishPath $publishPath
Copy link
Member

@adityapatwardhan adityapatwardhan Mar 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove the CI switch and related code from Restore-PSModuleToBuild?

Copy link
Member Author

@daxian-dbw daxian-dbw Mar 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

}

# Restore the Pester module
if ($CI) {
Restore-PSPester -Destination (Join-Path $publishPath "Modules")
}
}

Expand All @@ -646,22 +650,12 @@ function Restore-PSModuleToBuild
param(
[Parameter(Mandatory)]
[string]
$PublishPath,
[Switch]
$CI
$PublishPath
)

Write-Log "Restore PowerShell modules to $publishPath"

$modulesDir = Join-Path -Path $publishPath -ChildPath "Modules"

Copy-PSGalleryModules -Destination $modulesDir

if($CI.IsPresent)
{
# take the latest version of pester and install it so it may be used
Restore-PSPester -Destination $modulesDir
}
}

function Restore-PSPester
Expand Down