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
5 changes: 4 additions & 1 deletion tools/releaseBuild/azureDevOps/releaseBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ variables:
value: 1
- name: NugetSecurityAnalysisWarningLevel
value: none

- name: branchCounterKey
value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
- name: branchCounter
value: $[counter(variables['branchCounterKey'], 1)]
stages:
- stage: prep
jobs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ jobs:
- powershell: |
new-item -itemtype Directory -path '$(Build.StagingDirectory)\signedPackages'
Get-ChildItem "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-*.msi*" | copy-item -Destination '$(Build.StagingDirectory)\signedPackages'
displayName: 'Fake Signing'
displayName: 'Fake msi* Signing'
condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))

- pwsh: |
Get-ChildItem "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-*.exe" | copy-item -Destination '$(Build.StagingDirectory)\signedPackages'
displayName: 'Fake exe Signing'
condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))

- template: upload.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/setReleaseTag.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
$versionPart = $versionPart -replace '-.*$'
}

$releaseTag = "$versionPart-daily.$((Get-Date).ToString('yyyyMMdd'))"
$releaseTag = "$versionPart-daily$((Get-Date).ToString('yyyyMMdd')).$($env:BRANCHCOUNTER)"
$vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag"
Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose
Write-Host -Object "##$vstsCommandString"
Expand Down