From 88d7417faf4e5b4b315dc29ac1c9a09cebf44bf4 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 12 Nov 2025 08:59:57 -0800 Subject: [PATCH 1/2] Fix template path for rebuild branch check in package.yml (#26425) --- .pipelines/templates/packaging/windows/package.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.pipelines/templates/packaging/windows/package.yml b/.pipelines/templates/packaging/windows/package.yml index 83cdf730b53..3a4ecacbfce 100644 --- a/.pipelines/templates/packaging/windows/package.yml +++ b/.pipelines/templates/packaging/windows/package.yml @@ -60,7 +60,7 @@ jobs: nativePathRoot: '$(Agent.TempDirectory)' ob_restore_phase: false - - template: rebuild-branch-check.yml@self + - template: /.pipelines/templates/rebuild-branch-check.yml@self - download: CoOrdinatedBuildPipeline artifact: drop_windows_build_windows_${{ parameters.runtime }}_release @@ -223,4 +223,6 @@ jobs: - pwsh: | Get-ChildItem -Path $(ob_outputDirectory) -Recurse - displayName: 'List unsigned artifacts' + displayName: 'List artifacts' + env: + ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue From 1229358f92f77e1a6e10514907bc027864d3eb71 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Fri, 5 Dec 2025 11:10:12 -0800 Subject: [PATCH 2/2] Fix bad merge --- .pipelines/templates/packaging/windows/package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pipelines/templates/packaging/windows/package.yml b/.pipelines/templates/packaging/windows/package.yml index 3a4ecacbfce..2d2869867c0 100644 --- a/.pipelines/templates/packaging/windows/package.yml +++ b/.pipelines/templates/packaging/windows/package.yml @@ -58,7 +58,6 @@ jobs: - template: /.pipelines/templates/cloneToOfficialPath.yml@self parameters: nativePathRoot: '$(Agent.TempDirectory)' - ob_restore_phase: false - template: /.pipelines/templates/rebuild-branch-check.yml@self