Skip to content

Fix daily NuGet publishing #8460

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
Travis Plunk (TravisEz13) merged 2 commits into from
Dec 13, 2018
Merged

Fix daily NuGet publishing #8460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fa4134
make daily nuget package get built with daily version
TravisEz13 Dec 13, 2018
07b7ef4
[feature] fix travis ci build number generation code for Az DevOps
TravisEz13 Dec 13, 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
40 changes: 13 additions & 27 deletions tools/appveyor.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,11 +589,22 @@ function Invoke-AppveyorFinish
try {
$releaseTag = Get-ReleaseTag

$previewVersion = $releaseTag.Split('-')
$previewPrefix = $previewVersion[0]
$previewLabel = $previewVersion[1].replace('.','')

if(Test-DailyBuild)
{
$previewLabel= "daily{0}" -f $previewLabel
}

$preReleaseVersion = "$previewPrefix-$previewLabel.$env:BUILD_BUILDID"

# Build clean before backing to remove files from testing
Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -Clean
Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean

# Build packages
$packages = Start-PSPackage -Type msi,nupkg,zip -ReleaseTag $releaseTag -SkipReleaseChecks
$packages = Start-PSPackage -Type msi,nupkg,zip -ReleaseTag $preReleaseVersion -SkipReleaseChecks

$artifacts = New-Object System.Collections.ArrayList
foreach ($package in $packages) {
Expand All @@ -608,31 +619,6 @@ function Invoke-AppveyorFinish
}
}

if ($env:APPVEYOR_REPO_TAG_NAME)
{
$preReleaseVersion = $env:APPVEYOR_REPO_TAG_NAME
}
else
{
$previewVersion = $releaseTag.Split('-')
$previewPrefix = $previewVersion[0]
$previewLabel = $previewVersion[1].replace('.','')

if(Test-DailyBuild)
{
$previewLabel= "daily{0}" -f $previewLabel
}

if ($env:TF_BUILD)
{
$preReleaseVersion = "$previewPrefix-$previewLabel.$env:BUILD_BUILDID"
}
else
{
$preReleaseVersion = "$previewPrefix-$previewLabel.$env:APPVEYOR_BUILD_NUMBER"
}
}

# the packaging tests find the MSI package using env:PSMsiX64Path
$env:PSMsiX64Path = $artifacts | Where-Object { $_.EndsWith(".msi")}

Expand Down
13 changes: 9 additions & 4 deletions tools/travis.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,18 @@ function Get-ReleaseTag
$metaData = Get-Content $metaDataPath | ConvertFrom-Json

$releaseTag = $metadata.PreviewReleaseTag
if($env:TRAVIS_BUILD_NUMBER)
$previewVersion = $releaseTag.Split('-')
$previewPrefix = $previewVersion[0]
$previewLabel = $previewVersion[1].replace('.','')

if($isDailyBuild)
{
$releaseTag = $releaseTag.split('.')[0..2] -join '.'
$releaseTag = $releaseTag+'.'+$env:TRAVIS_BUILD_NUMBER
$previewLabel= "daily{0}" -f $previewLabel
}

return $releaseTag
$preReleaseVersion = "$previewPrefix-$previewLabel.$env:BUILD_BUILDID"

return $preReleaseVersion
}

# This function retrieves the appropriate svg to be used when presenting
Expand Down