diff --git a/tools/releaseBuild/macOS/PowerShellPackage.ps1 b/tools/releaseBuild/macOS/PowerShellPackage.ps1 deleted file mode 100644 index ba4eef866..000000000 --- a/tools/releaseBuild/macOS/PowerShellPackage.ps1 +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -# PowerShell Script to build and package PowerShell from specified form and branch -# Script is intented to use in Docker containers -# Ensure PowerShell is available in the provided image - -param ( - # Set default location to where VSTS cloned the repository locally. - [string] $location = $env:BUILD_REPOSITORY_LOCALPATH, - - # Destination location of the package on docker host - [string] $destination = '/mnt', - - [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d+)?)?$")] - [ValidateNotNullOrEmpty()] - [string]$ReleaseTag, - - [ValidateSet("zip", "tar")] - [string[]]$ExtraPackage -) - -# We must build in /PowerShell - -# cleanup the folder but don't delete it or the build agent will loose ownership of the folder -Get-ChildItem -Path /PowerShell/* -Attributes Hidden,Normal,Directory | Remove-Item -Recurse -Force - -# clone the repositor to the location we must build from -git clone $location /PowerShell - -$releaseTagParam = @{} -if ($ReleaseTag) -{ - $releaseTagParam = @{ 'ReleaseTag' = $ReleaseTag } -} - -Push-Location -try { - Set-Location /PowerShell - git submodule update --init --recursive --quiet - Import-Module "/PowerShell/build.psm1" - Import-Module "/PowerShell/tools/packaging" - - Start-PSBootstrap -Package -NoSudo - Start-PSBuild -Crossgen -PSModuleRestore @releaseTagParam - - Start-PSPackage @releaseTagParam - switch ($ExtraPackage) - { - "zip" { Start-PSPackage -Type zip @releaseTagParam } - "tar" { Start-PSPackage -Type tar @releaseTagParam } - } -} -finally -{ - Pop-Location -} - -$linuxPackages = Get-ChildItem "/PowerShell/powershell*" -Include *.pkg,*.zip,*.tar.gz -foreach ($linuxPackage in $linuxPackages) -{ - $filePath = $linuxPackage.FullName - $name = split-path -Leaf -Path $filePath - $extension = (Split-Path -Extension -Path $filePath).Replace('.','') - Write-Verbose "Copying $filePath to $destination" -Verbose - Write-Host "##vso[artifact.upload containerfolder=results;artifactname=$name]$filePath" - Write-Host "##vso[task.setvariable variable=Package-$extension]$filePath" - Copy-Item -Path $filePath -Destination $destination -force -} diff --git a/tools/releaseBuild/macOS/PowerShellPackage.sh b/tools/releaseBuild/macOS/PowerShellPackage.sh deleted file mode 100644 index 10cfeb00e..000000000 --- a/tools/releaseBuild/macOS/PowerShellPackage.sh +++ /dev/null @@ -1 +0,0 @@ -pwsh -command ".\PowerShellPackage.ps1 $*" diff --git a/tools/releaseBuild/macOS/vsts.yml b/tools/releaseBuild/macOS/vsts.yml index 26da4047e..17efb2592 100644 --- a/tools/releaseBuild/macOS/vsts.yml +++ b/tools/releaseBuild/macOS/vsts.yml @@ -1,3 +1,9 @@ +resources: +- repo: self + clean: true +queue: + name: Hosted macOS Preview +name: macOS_$(Build.SourceBranchName)_$(Build.BuildId) steps: #- task: @ # inputs: