Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
463 changes: 0 additions & 463 deletions tools/releaseBuild/azureDevOps/WindowsBuild.yml

This file was deleted.

17 changes: 15 additions & 2 deletions tools/releaseBuild/azureDevOps/releaseBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,18 @@ pr:
- master
- release*

resources:
repositories:
- repository: ComplianceRepo
type: github
endpoint: ComplianceGHRepo
name: PowerShell/compliance

variables:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
POWERSHELL_TELEMETRY_OPTOUT: 1
- name: DOTNET_CLI_TELEMETRY_OPTOUT
value: 1
- name: POWERSHELL_TELEMETRY_OPTOUT
value: 1

stages:
- stage: prep
Expand Down Expand Up @@ -146,6 +155,10 @@ stages:
pool:
vmImage: 'windows-latest'
steps:
- checkout: self
clean: true
fetchDepth: 1

- template: templates/SetVersionVariables.yml
parameters:
ReleaseTagVar: $(ReleaseTagVar)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,29 @@ parameters:
CreateJson: 'no'

steps:
- powershell: |
$path = "./build.psm1"

if(Test-Path -Path $path)
{
$vstsCommandString = "vso[task.setvariable variable=repoRoot]."
Write-Host ("sending " + $vstsCommandString)
Write-Host "##$vstsCommandString"
}
else{
$path = "./PowerShell/build.psm1"
if(Test-Path -Path $path)
{
$vstsCommandString = "vso[task.setvariable variable=repoRoot]./PowerShell"
Write-Host ("sending " + $vstsCommandString)
Write-Host "##$vstsCommandString"
}
}
displayName: 'Set repo Root'

- powershell: |
$createJson = ("${{ parameters.ReleaseTagVarName }}" -ne "no")
$releaseTag = tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag ${{ parameters.ReleaseTagVar }} -Variable "${{ parameters.ReleaseTagVarName }}" -CreateJson:$createJson
$releaseTag = & "$env:REPOROOT/tools/releaseBuild/setReleaseTag.ps1" -ReleaseTag ${{ parameters.ReleaseTagVar }} -Variable "${{ parameters.ReleaseTagVarName }}" -CreateJson:$createJson
$version = $releaseTag.Substring(1)
$vstsCommandString = "vso[task.setvariable variable=Version]$version"
Write-Host ("sending " + $vstsCommandString)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- template: SetVersionVariables.yml
parameters:
ReleaseTagVar: $(ReleaseTagVar)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
steps:
- powershell: |
$dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
$nativePath = "${dirSeparatorChar}PowerShell"
Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"

if ((Test-Path "$nativePath")) {
Remove-Item -Path "$nativePath" -Force -Recurse -Verbose -ErrorAction ignore
}
else {
Write-Verbose -Verbose -Message "No cleanup required."
}

git clone --quiet $env:REPOROOT $nativePath
displayName: Clone PowerShell Repo to /PowerShell
errorActionPreference: silentlycontinue
1 change: 1 addition & 0 deletions tools/releaseBuild/azureDevOps/templates/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- template: SetVersionVariables.yml
parameters:
Expand Down
1 change: 1 addition & 0 deletions tools/releaseBuild/azureDevOps/templates/json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
# displayName: '<display name of task>'
- checkout: self
clean: true
fetchDepth: 1

- template: SetVersionVariables.yml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- template: shouldSign.yml

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ jobs:
sudo chown $env:USER /PowerShell
displayName: 'Create /PowerShell'

- pwsh: |
Write-Host "##vso[task.setvariable variable=PowerShellRoot]/PowerShell"
git clone $env:BUILD_REPOSITORY_LOCALPATH /PowerShell
displayName: Clone PowerShell Repo to /PowerShell

- template: shouldSign.yml

#- task: <task type name>@<version>
Expand All @@ -39,6 +34,7 @@ jobs:
parameters:
ReleaseTagVar: $(ReleaseTagVar)

- template: cloneToOfficialPath.yml

- task: DownloadBuildArtifacts@0
displayName: Download macosBinResults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- template: shouldSign.yml

Expand Down
5 changes: 1 addition & 4 deletions tools/releaseBuild/azureDevOps/templates/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ jobs:
sudo chown $env:USER /PowerShell
displayName: 'Create /PowerShell'

- pwsh: |
Write-Host "##vso[task.setvariable variable=PowerShellRoot]/PowerShell"
git clone $env:BUILD_REPOSITORY_LOCALPATH /PowerShell
displayName: Clone PowerShell Repo to /PowerShell
- template: cloneToOfficialPath.yml

- pwsh: |
tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- download: releasePipeline
artifact: finalResults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- download: releasePipeline
artifact: finalResults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- download: releasePipeline
artifact: finalResults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- template: ./SetVersionVariables.yml
parameters:
Expand Down
125 changes: 0 additions & 125 deletions tools/releaseBuild/azureDevOps/templates/windows-build.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
parameters:
BuildConfiguration: release
BuildPlatform: any cpu
Architecture: x64
parentJob: ''
- name: BuildConfiguration
default: release
- name: BuildPlatform
default: any cpu
- name: Architecture
default: x64
- name: parentJob
default: ''

jobs:
- job: build_windows_${{ parameters.Architecture }}
displayName: Build Windows - ${{ parameters.Architecture }}
Expand All @@ -28,11 +33,7 @@ jobs:

- template: insert-nuget-config-azfeed.yml

- powershell: |
Write-Host "##vso[task.setvariable variable=PowerShellRoot]/PowerShell"
$null = New-Item -ItemType Directory -Path /Powershell -Force
git clone $env:BUILD_REPOSITORY_LOCALPATH /PowerShell
displayName: Clone PowerShell Repo to /PowerShell
- template: cloneToOfficialPath.yml

- powershell: |

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
steps:
- checkout: self
clean: true
fetchDepth: 1

- template: shouldSign.yml
- template: SetVersionVariables.yml
Expand Down
Loading