Skip to content

Commit

Permalink
Brianem/abstract pool name (#252)
Browse files Browse the repository at this point in the history
* abstract agent pool name behind ado labrary variable, so the same YAML can run in multiple pileines tha tuse different agent pool names.

* update version of ESRP Sign that is used.

* update esrp task version to an even hight number.

* Can't get permissions the the SP Michael setup, so trying to create a new one

* update version of .Net core needed by EsrpCodeSigning@4
  • Loading branch information
BrianMouncer authored Mar 28, 2024
1 parent 39f484a commit 158df9c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
25 changes: 12 additions & 13 deletions .azure/pipelines/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pr:
- main

pool:
name: SkymanUbuntu2004Hosted
name: $(UbuntuPipelineName)

parameters:
- name: signNugetPackages
Expand Down Expand Up @@ -79,16 +79,15 @@ stages:
projects: 'src/ai/ai-cli.csproj'
arguments: '--configuration Release -p:CLIAssemblyVersion=$(AICLISemVerVersion) -p:CLIAssemblyInformationalVersion=$(AICLIVersion) -p:PackageVersion=$(AICLIVersion) -o "$(Build.ArtifactStagingDirectory)"'
- task: UseDotNet@2
displayName: 'Use .NET Core 2.1 (signing requirement)'
displayName: 'Use .NET Core 6.0 (signing requirement for EsrpCodeSigning@4)'
inputs:
packageType: 'sdk'
version: '2.1.x'
- ${{ if eq(parameters.signNugetPackages, true) }}:
- template: sign-nuget.yaml
parameters:
displayName: 'Sign AI CLI NuGet package'
folderPath: '$(Build.ArtifactStagingDirectory)'
pattern: '$(AICLINuPkgFileName)'
version: '6.0.x'
- template: sign-nuget.yaml
parameters:
displayName: 'Sign AI CLI NuGet package'
folderPath: '$(Build.ArtifactStagingDirectory)'
pattern: '$(AICLINuPkgFileName)'
- task: Bash@3
displayName: 'Create installation script'
inputs:
Expand Down Expand Up @@ -117,14 +116,14 @@ stages:
- task: AzureCLI@2
displayName: Upload NuGet package
inputs:
azureSubscription: 'Carbon Dropper (CSSpeechStorage Drop)'
azureSubscription: 'Carbon Dropper2 (CSSpeechStorage Drop)'
scriptType: 'bash'
arguments: '$(Build.ArtifactStagingDirectory)/$(AICLINuPkgFileName) private/ai/$(AICLINuPkgFileName)'
scriptPath: './.azure/pipelines/scripts/upload-file.sh'
- task: AzureCLI@2
displayName: Upload installation script
inputs:
azureSubscription: 'Carbon Dropper (CSSpeechStorage Drop)'
azureSubscription: 'Carbon Dropper2 (CSSpeechStorage Drop)'
scriptType: 'bash'
arguments: '$(Build.ArtifactStagingDirectory)/InstallAzureAICLIDeb-$(AICLIVersion).sh private/ai/InstallAzureAICLIDeb-$(AICLIVersion).sh'
scriptPath: './.azure/pipelines/scripts/upload-file.sh'
Expand Down Expand Up @@ -220,7 +219,7 @@ stages:
dependsOn: SetupStage
condition: and(succeeded(), or(eq(variables['IsRelease'], 'true'), eq(variables['PublishDevBuild'], 'true')))
pool:
name: SkymanWS2022Compliant
name: $(WindowsPipelineName)
jobs:
- job: BuildWindowsInstaller
variables:
Expand Down Expand Up @@ -270,7 +269,7 @@ stages:

- task: AzureCLI@2
inputs:
azureSubscription: 'Carbon Dropper (CSSpeechStorage Drop)'
azureSubscription: 'Carbon Dropper2 (CSSpeechStorage Drop)'
scriptType: 'bash'
arguments: '$(Build.ArtifactStagingDirectory)/Azure-AI-CLI-Setup-$(AICLIVersion)-x64.exe private/ai/Azure-AI-CLI-Setup-$(AICLIVersion)-x64.exe'
scriptPath: './.azure/pipelines/scripts/upload-file.sh'
Expand Down
2 changes: 1 addition & 1 deletion .azure/pipelines/sign-dll-exe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:
default: true

steps:
- task: EsrpCodeSigning@2
- task: EsrpCodeSigning@4
displayName: ${{ parameters.displayName }}
inputs:
ConnectedServiceName: 'Speech SDK ESRP Signing Alternate'
Expand Down
2 changes: 1 addition & 1 deletion .azure/pipelines/sign-nuget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:
default: true

steps:
- task: EsrpCodeSigning@1
- task: EsrpCodeSigning@4
displayName: ${{ parameters.displayName }}
inputs:
ConnectedServiceName: 'Speech SDK ESRP Signing Alternate'
Expand Down

0 comments on commit 158df9c

Please sign in to comment.