diff --git a/.az-pipelines/sign-windows-artifacts.yml b/.az-pipelines/sign-windows-artifacts.yml index 601192c1..737d5e0b 100644 --- a/.az-pipelines/sign-windows-artifacts.yml +++ b/.az-pipelines/sign-windows-artifacts.yml @@ -39,8 +39,7 @@ steps: displayName: 'show artifacts' - script: | - echo "File to sign: $(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-ia32.appx" - azuresigntool sign -kvu "$(SigningVaultURL)" -kvi "$(SigningClientId)" -kvs "$(SigningClientSecret)" -kvc "$(SigningCertName)" -tr http://timestamp.digicert.com "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-ia32.appx" + azuresigntool sign -kvu "$(SigningVaultURL)" -kvi "$(SigningClientId)" -kvs "$(SigningClientSecret)" -kvc "$(SigningCertName)" -tr http://timestamp.digicert.com "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-ia32-store.appx" displayName: 'Sign artifacts 32-bit' - script: | @@ -48,17 +47,12 @@ steps: -kvu "$(SigningVaultURL)" ^ -kvi "$(SigningClientId)" ^ -kvs "$(SigningClientSecret)" ^ - -kvt "$(SigningTenantId)" ^ -kvc "$(SigningCertName)" ^ + -tr http://timestamp.digicert.com -v ^ - "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-x64.appx" + "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-x64-store.appx" displayName: 'Sign artifacts 64-bit' -- task: CmdLine@2 - displayName: 'Sign artifact test' - inputs: - script: AzureSignTool sign -du "$(SigningURL)" -kvu "$(SigningVaultURL)" -kvi "$(SigningClientId)" -kvs "$(SigningClientSecret)" -kvc "$(SigningCertName)" -v "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-ia32.appx" - - task: PublishPipelineArtifact@1 inputs: pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-$(git_release_version)-ia32.appx' diff --git a/.az-pipelines/test-ast-install.yml b/.az-pipelines/test-ast-install.yml index 5311d9ff..3f0d33b1 100644 --- a/.az-pipelines/test-ast-install.yml +++ b/.az-pipelines/test-ast-install.yml @@ -9,7 +9,7 @@ variables: steps: - script: | git clone https://github.com/vcsjones/AzureSignTool.git - cd AzureSignTool + cd AzureSignTool/src/AzureSignTool dotnet tool restore displayName: 'install AzureSignTool'