Skip to content

Update to latest EsrpClientTool task and allow version override for testing #916

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
mjcheetham merged 2 commits into from
May 15, 2026
Merged

Update to latest EsrpClientTool task and allow version override for testing #916

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
18d86aa
release: bump to latest EsrpClientTool task v5
mjcheetham May 14, 2026
5cd61fb
azure-pipelines: allow overriding Git version
mjcheetham May 15, 2026
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
2 changes: 1 addition & 1 deletion .azure-pipelines/esrp/windows/setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ parameters:
type: string

steps:
- task: EsrpClientTool@4
- task: EsrpClientTool@5
Copy link
Copy Markdown
Member Author

@mjcheetham mjcheetham May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This installs the latest 2.x of the esrpclient.exe which is about 25% faster when submitting files for signing!

name: esrpinstall
displayName: 'Install ESRP client'
- task: AzureCLI@2
Expand Down
35 changes: 28 additions & 7 deletions .azure-pipelines/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ parameters:
type: boolean
default: false # TODO: change default to true after testing
displayName: 'Enable GitHub release publishing'
- name: 'versionOverride'
type: string
default: '-'
Copy link
Copy Markdown
Member Author

@mjcheetham mjcheetham May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot use empty string '' because Azure Pipelines treats this as not being set, and then without a default this becomes a required property! Great... Use '-' as a sentinel value for 'not set'.

displayName: 'Version override (release publishing is skipped if set)'

#
# 1ES Pipeline Templates do not allow using a matrix strategy so we create
Expand Down Expand Up @@ -121,12 +125,29 @@ extends:
- checkout: self
fetchDepth: 0
fetchTags: true
- task: Bash@3
displayName: 'Resolve version and tag information'
name: info
inputs:
targetType: filePath
filePath: .azure-pipelines/scripts/resolve-version.sh
- ${{ if or(eq(parameters.versionOverride, ''), eq(parameters.versionOverride, '-')) }}:
- task: Bash@3
displayName: 'Resolve version and tag information'
name: info
inputs:
targetType: filePath
filePath: .azure-pipelines/scripts/resolve-version.sh
- ${{ if and(ne(parameters.versionOverride, ''), ne(parameters.versionOverride, '-')) }}:
- task: Bash@3
displayName: 'Set version override information'
name: info
inputs:
targetType: inline
script: |
tag_sha=$(git rev-parse HEAD)
echo "##vso[task.logissue type=warning]Using version override: ${{ parameters.versionOverride }}. Release publishing will be skipped."
echo "Git version: ${{ parameters.versionOverride }}"
echo "Tag name: untagged"
echo "Tag SHA: ${tag_sha}"
echo "##vso[task.setvariable variable=git_version;isOutput=true;isReadOnly=true]${{ parameters.versionOverride }}"
echo "##vso[task.setvariable variable=tag_name;isOutput=true;isReadOnly=true]untagged"
echo "##vso[task.setvariable variable=tag_sha;isOutput=true;isReadOnly=true]${tag_sha}"
echo "##vso[build.updatebuildnumber][UNTAGGED] ${tag_sha} (${BUILD_BUILDNUMBER:-unknown})"

- stage: build
displayName: 'Build'
Expand Down Expand Up @@ -956,7 +977,7 @@ extends:
- ${{ each dim in parameters.linux_matrix }}:
- validate_${{ dim.id }}
displayName: 'Publish GitHub release'
condition: and(succeeded(), eq('${{ parameters.github }}', true))
condition: and(succeeded(), eq('${{ parameters.github }}', true), or(eq('${{ parameters.versionOverride }}', ''), eq('${{ parameters.versionOverride }}', '-')))
pool:
name: GitClientPME-1ESHostedPool-intel-pc
image: ubuntu-x86_64-ado1es
Expand Down
Loading