From 10c963a7dbdd0d9e71dd0596e96fa26ab88a76f5 Mon Sep 17 00:00:00 2001 From: Michael Niksa Date: Wed, 9 Feb 2022 16:04:22 -0800 Subject: [PATCH] Automate packaged submission into Windows (#12449) We're now building a fully provenance, compliance, and security validated package (vpack) through our Release pipeline. This attaches the last phase which automates the submission into the Windows product. It will also automatically trace back the source, commit SHA, and build to the submission here from the Windows side. * [x] Automates a manual activity I performed a few times recently * [x] I work here * [x] Ran a test of it against `release-1.12` and it worked --- .github/actions/spelling/expect/expect.txt | 7 +++++++ build/config/GitCheckin.json | 24 ++++++++++++++++++++++ build/pipelines/release.yml | 15 ++++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 build/config/GitCheckin.json diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt index 326a70423fc..3afa4c47656 100644 --- a/.github/actions/spelling/expect/expect.txt +++ b/.github/actions/spelling/expect/expect.txt @@ -237,6 +237,7 @@ charlespetzold charset CHARSETINFO chcp +Checkin checkbox checkboxes chh @@ -318,6 +319,7 @@ concat concfg conclnt conddkrefs +condev condrv conechokey conemu @@ -672,6 +674,7 @@ dwriteglyphrundescriptionclustermap dxgi dxgidwm dxinterop +dxp dxsm dxttbmp Dyreen @@ -1152,6 +1155,7 @@ ioctl iomanip iostream iot +ipa ipch ipconfig IPersist @@ -1475,6 +1479,7 @@ MSGSELECTMODE msiexec MSIL msix +mspartners msrc msvcrt MSVCRTD @@ -2668,6 +2673,7 @@ wddmcon wddmconrenderer WDDMCONSOLECONTEXT wdm +wdx webclient webpage website @@ -2702,6 +2708,7 @@ wincontypes WINCORE windbg WINDEF +windev WINDIR windll WINDOWALPHA diff --git a/build/config/GitCheckin.json b/build/config/GitCheckin.json new file mode 100644 index 00000000000..8bfcb203023 --- /dev/null +++ b/build/config/GitCheckin.json @@ -0,0 +1,24 @@ +{ + "Branch": [ + { + "collection": "microsoft", + "project": "OS", + "repo": "os.2020", + "name": "official/rs_wdx_dxp_windev", + "workitem": "38106206", + "CheckinFiles": [ + { + "source": "WindowsTerminal.app.man", + "path": "/redist/mspartners/ipa/WindowsTerminal", + "type": "File" + } + ] + } + ], + "Email": [ + { + "sendTo": "condev", + "sendOnErrorOnly": "False" + } + ] + } \ No newline at end of file diff --git a/build/pipelines/release.yml b/build/pipelines/release.yml index 99cbf44bbb3..826455abd0f 100644 --- a/build/pipelines/release.yml +++ b/build/pipelines/release.yml @@ -529,7 +529,18 @@ jobs: SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: sourceDirectory: $(System.ArtifactsDirectory)\appxbundle-signed\WindowsTerminal.app - description: Windows Terminal pre-install application + description: VPack for the Windows Terminal Application pushPkgName: WindowsTerminal.app - owner: condev + owner: conhost + - task: PublishPipelineArtifact@1 + displayName: 'Copy VPack Manifest to Drop' + inputs: + targetPath: $(XES_VPACKMANIFESTDIRECTORY) + artifactName: VPackManifest + - task: PkgESFCIBGit@12 + displayName: 'Submit VPack Manifest to Windows' + inputs: + configPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json' + artifactsDirectory: $(XES_VPACKMANIFESTDIRECTORY) + prTimeOut: 5 ...