release yml: name the package correctly, don't duplicate appx (#13852)

I got tired of renaming the packages that came out of our build
pipeline. I also got tired of the fact that every appxbundle artifact we
upload comes with another whole copy of Terminal for every architecture,
plus all their symbols. Those are reflected in other artifacts, so
there's no reason to duplicate them.
This commit is contained in:
Dustin L. Howett 2022-08-25 17:46:06 -05:00 committed by GitHub
parent 4488a25971
commit 623a59ecaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -330,6 +330,13 @@ jobs:
${{ windowsVersion }}: ${{ windowsVersion }}:
TerminalTargetWindowsVersion: ${{ windowsVersion }} TerminalTargetWindowsVersion: ${{ windowsVersion }}
displayName: Create and sign AppX/MSIX bundles displayName: Create and sign AppX/MSIX bundles
variables:
${{ if eq(parameters.branding, 'Release') }}:
BundleStemName: Microsoft.WindowsTerminal
${{ elseif eq(parameters.branding, 'Preview') }}:
BundleStemName: Microsoft.WindowsTerminalPreview
${{ else }}:
BundleStemName: WindowsTerminalDev
dependsOn: Build dependsOn: Build
steps: steps:
- checkout: self - checkout: self
@ -354,14 +361,15 @@ jobs:
$Components = "$(XES_APPXMANIFESTVERSION)" -Split "\." $Components = "$(XES_APPXMANIFESTVERSION)" -Split "\."
$Components[0] = ([int]$Components[0] + $VersionEpoch) $Components[0] = ([int]$Components[0] + $VersionEpoch)
$BundleVersion = $Components -Join "." $BundleVersion = $Components -Join "."
.\build\scripts\Create-AppxBundle.ps1 -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\Microsoft.WindowsTerminal_$(TerminalTargetWindowsVersion)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle" New-Item -Type Directory "$(System.ArtifactsDirectory)\bundle"
.\build\scripts\Create-AppxBundle.ps1 -InputPath "$(System.ArtifactsDirectory)" -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(TerminalTargetWindowsVersion)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
displayName: Create WindowsTerminal*.msixbundle displayName: Create WindowsTerminal*.msixbundle
- task: EsrpCodeSigning@1 - task: EsrpCodeSigning@1
displayName: Submit *.msixbundle to ESRP for code signing displayName: Submit *.msixbundle to ESRP for code signing
inputs: inputs:
ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
FolderPath: $(System.ArtifactsDirectory) FolderPath: $(System.ArtifactsDirectory)\bundle
Pattern: Microsoft.WindowsTerminal*.msixbundle Pattern: $(BundleStemName)*.msixbundle
UseMinimatch: true UseMinimatch: true
signConfigType: inlineSignParams signConfigType: inlineSignParams
inlineOperation: >- inlineOperation: >-
@ -394,7 +402,7 @@ jobs:
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: appxbundle-signed' displayName: 'Publish Artifact: appxbundle-signed'
inputs: inputs:
PathtoPublish: $(System.ArtifactsDirectory) PathtoPublish: $(System.ArtifactsDirectory)\bundle
ArtifactName: appxbundle-signed-$(TerminalTargetWindowsVersion) ArtifactName: appxbundle-signed-$(TerminalTargetWindowsVersion)
- ${{ if eq(parameters.buildConPTY, true) }}: - ${{ if eq(parameters.buildConPTY, true) }}: