Merged PR 5694: port mac changes from GitHub (#8189, #8188, #8185)

This commit is contained in:
Travis Plunk
2018-11-06 22:10:02 +00:00
parent da5d8e707d
commit 1ddc3da663
+14 -6
View File
@@ -14,6 +14,16 @@ steps:
scriptPath: 'tools/releaseBuild/setReleaseTag.sh'
args: '-ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar"'
displayName: 'Calculate Release Tag'
- powershell: |
Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
{
throw "nuget.config is not created"
}
displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
condition: ne(Variables['SkipFxDependent'], 'true')
- task: ShellScript@2
inputs:
scriptPath: 'tools/installpsh-osx.sh'
@@ -27,10 +37,8 @@ steps:
scriptPath: 'tools/releaseBuild/macOS/PowerShellPackageVsts.sh'
args: '-location $(Build.SourcesDirectory) -BootStrap'
displayName: 'Bootstrap VM'
- task: ShellScript@2
inputs:
scriptPath: 'tools/releaseBuild/macOS/PowerShellPackageVsts.sh'
args: '-ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -ExtraPackage "tar" -location $(Build.SourcesDirectory) -Build'
disableAutoCwd: true
cwd: 'tools/releaseBuild/macOS'
- powershell: |
$env:AZDEVOPSFEEDPAT = '$(AzDevOpsFeedPAT)'
$(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -ExtraPackage "tar" -location $(Build.SourcesDirectory) -Build
$env:AZDEVOPSFEEDPAT = $null
displayName: 'Build and Package'