Skip to content

Package only from root plus powershell #4569

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 9 commits into from
Aug 15, 2017
Merged

Package only from root plus powershell #4569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0459d0b
Add RootInfo to PSOptions
TravisEz13 Aug 5, 2017
abbc969
stop packaging release if RootInfo is not valid
TravisEz13 Aug 14, 2017
ad3192a
add ability to skip release checks
TravisEz13 Aug 7, 2017
54c56d9
skip release checking when packaging in CI
TravisEz13 Aug 7, 2017
2783c81
remove warning for invalid root
TravisEz13 Aug 14, 2017
842899e
remove extra space
TravisEz13 Aug 14, 2017
faf529d
simply conditional using elseif
TravisEz13 Aug 14, 2017
3d2ba14
Remove extra space
daxian-dbw Aug 14, 2017
d6c0ce7
Address PR feedback regarding adding hashtables
TravisEz13 Aug 15, 2017
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
18 changes: 17 additions & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,23 @@ function New-PSOptions {
$Top = [IO.Path]::Combine($PSScriptRoot, "src", "System.Management.Automation")
}

return @{ Top = $Top;
$RootInfo = @{RepoPath = $PSScriptRoot}

# the valid root is the root of the filesystem and the folder PowerShell
$RootInfo['ValidPath'] = Join-Path -Path ([system.io.path]::GetPathRoot($RootInfo.RepoPath)) -ChildPath 'PowerShell'

if($RepoInfo.RepoPath -ne $RootInfo.ValidPath)
{
$RootInfo['Warning'] = "Please ensure you repo is at the root of the file system and named 'PowerShell' (example: '$($RootInfo.ValidPath)'), when building and packaging for release!"
$RootInfo['IsValid'] = $false
}
else
{
$RootInfo['IsValid'] = $true
}

return @{ RootInfo = [PSCustomObject]$RootInfo
Top = $Top;
Configuration = $Configuration;
Framework = $Framework;
Runtime = $Runtime;
Expand Down
2 changes: 1 addition & 1 deletion tools/appveyor.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ function Invoke-AppveyorFinish
}

# Build packages
$packages = Start-PSPackage @packageParams
$packages = Start-PSPackage @packageParams -SkipReleaseChecks

$name = Get-PackageName

Expand Down
11 changes: 10 additions & 1 deletion tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ function Start-PSPackage {

[Switch] $Force,

[Switch] $IncludeSymbols
[Switch] $IncludeSymbols,

[Switch] $SkipReleaseChecks
)

# Runtime and Configuration settings required by the package
Expand Down Expand Up @@ -81,6 +83,13 @@ function Start-PSPackage {
throw "Please ensure you have run 'Start-PSBuild $params'!"
}

if($SkipReleaseChecks.IsPresent) {
Write-Warning "Skipping release checks."
}
elseif(!$Script:Options.RootInfo.IsValid){
throw $Script:Options.RootInfo.Warning
}

# If ReleaseTag is specified, use the given tag to calculate Vesrion
if ($PSCmdlet.ParameterSetName -eq "ReleaseTag") {
$Version = $ReleaseTag -Replace '^v'
Expand Down
5 changes: 3 additions & 2 deletions tools/travis.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,9 @@ else
$packageParams += @{Version=$version}
}
# Only build packages for branches, not pull requests
$packages = @(Start-PSPackage @packageParams)
$packages += Start-PSPackage @packageParams -Type AppImage
$packages = @(Start-PSPackage @packageParams -SkipReleaseChecks)
# Packaging AppImage depends on the deb package
$packages += Start-PSPackage @packageParams -Type AppImage -SkipReleaseChecks
foreach($package in $packages)
{
# Publish the packages to the nuget feed if:
Expand Down