From ad9b53bc8dd23983982eebf63db0e9fc5f96394b Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Mon, 3 Nov 2025 16:24:44 -0800 Subject: [PATCH 1/3] Change build and pr ymls to empty pipelines. --- .ado/build.yml | 136 ++++++++++++++++++++++++++++--------------------- .ado/pr.yml | 82 ++++++++++++++++++----------- 2 files changed, 129 insertions(+), 89 deletions(-) diff --git a/.ado/build.yml b/.ado/build.yml index 27b5896..5ea1199 100644 --- a/.ado/build.yml +++ b/.ado/build.yml @@ -1,66 +1,84 @@ name: Build.$(Date:yyyy-MM-dd).$(Rev:r) -trigger: - batch: true - branches: - include: - - main - +trigger: none pr: none +resources: + repositories: + - repository: OfficePipelineTemplates + type: git + name: 1ESPipelineTemplates/OfficePipelineTemplates + ref: refs/tags/release + variables: - template: variables.yml -stages: - - stage: Build - jobs: - - template: templates/windows-build-job.yml - - - template: templates/apple-build-job.yml - - - template: templates/linux-build-job.yml - - - stage: Release - dependsOn: Build - condition: succeeded() - jobs: - - job: Publish - timeoutInMinutes: 15 - cancelTimeoutInMinutes: 2 - pool: - vmImage: 'windows-2019' - steps: - - task: InstallSSHKey@0 - inputs: - knownHostsEntry: github.com,192.30.255.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== - sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVmg0PBcc23t2Ys6C8o28qlHl8WL2tgptOky/sVSZ2dAMrTPog8ShQxs2c903PEuJGFtAnmBpjIDGcpSnJ38k+XDrkMvBgPReqjJQ+StNyriee8K2oPBOJURKWzGYvkMGC5daBv0keJxfFT71YhzHxoPwxCnXuodjAljhkmZsAYmeKt7MNUQILVpUxQOrVUmM3sN2ZaZ78hbpx+s3/G7kxYxsa4V+anT/HDyQBDLvyOGJce9yBZrI6B+pAbFiQ9dQg81EfRCtePJqjREjzQ5YMxCKlBi/ptL2xel9A7bsHuqK2xUeeY7Cix9ES/9AzTtgJaSmRh2jP7njooE29S81P rnsdkbot@microsoft.com - sshKeySecureFile: rnsdkbot_rsa - - - checkout: self - clean: false - submodules: false - - - task: CmdLine@2 - displayName: Configure git user/email - inputs: - script: | - call git config --global user.email "62199986+rnsdkbot@users.noreply.github.com" - call git config --global user.name "Mso bot" - call git remote set-url origin git@github.com:microsoft/Mso.git - - - script: yarn install --frozen-lockfile - displayName: Install yarn packages - - - script: yarn run beachball publish --branch origin/main --no-publish --message "Beachball Publish (no NPM) ***NO_CI***" --yes - displayName: Beachball publish (no NPM) - - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 📒 Generate Manifest - inputs: - BuildDropPath: $(System.DefaultWorkingDirectory) - - - task: PublishPipelineArtifact@1 - displayName: 📒 Publish Manifest - inputs: - artifactName: SBom-$(System.JobAttempt) - targetPath: $(System.DefaultWorkingDirectory)/_manifest \ No newline at end of file +extends: + template: v1/Office.Official.PipelineTemplate.yml@OfficePipelineTemplates + parameters: + pool: + name: Azure-Pipelines-1ESPT-ExDShared + image: windows-latest + os: windows + + stages: + - stage: placeholder + jobs: + - job: Placeholder + steps: + - script: echo "This is a placeholder stage." + + +# stages: +# - stage: Build +# jobs: +# - template: templates/windows-build-job.yml + +# - template: templates/apple-build-job.yml + +# - template: templates/linux-build-job.yml + +# - stage: Release +# dependsOn: Build +# condition: succeeded() +# jobs: +# - job: Publish +# timeoutInMinutes: 15 +# cancelTimeoutInMinutes: 2 +# pool: +# vmImage: 'windows-2019' +# steps: +# - task: InstallSSHKey@0 +# inputs: +# knownHostsEntry: github.com,192.30.255.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +# sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVmg0PBcc23t2Ys6C8o28qlHl8WL2tgptOky/sVSZ2dAMrTPog8ShQxs2c903PEuJGFtAnmBpjIDGcpSnJ38k+XDrkMvBgPReqjJQ+StNyriee8K2oPBOJURKWzGYvkMGC5daBv0keJxfFT71YhzHxoPwxCnXuodjAljhkmZsAYmeKt7MNUQILVpUxQOrVUmM3sN2ZaZ78hbpx+s3/G7kxYxsa4V+anT/HDyQBDLvyOGJce9yBZrI6B+pAbFiQ9dQg81EfRCtePJqjREjzQ5YMxCKlBi/ptL2xel9A7bsHuqK2xUeeY7Cix9ES/9AzTtgJaSmRh2jP7njooE29S81P rnsdkbot@microsoft.com +# sshKeySecureFile: rnsdkbot_rsa + +# - checkout: self +# clean: false +# submodules: false + +# - task: CmdLine@2 +# displayName: Configure git user/email +# inputs: +# script: | +# call git config --global user.email "62199986+rnsdkbot@users.noreply.github.com" +# call git config --global user.name "Mso bot" +# call git remote set-url origin git@github.com:microsoft/Mso.git + +# - script: yarn install --frozen-lockfile +# displayName: Install yarn packages + +# - script: yarn run beachball publish --branch origin/main --no-publish --message "Beachball Publish (no NPM) ***NO_CI***" --yes +# displayName: Beachball publish (no NPM) + +# - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 +# displayName: 📒 Generate Manifest +# inputs: +# BuildDropPath: $(System.DefaultWorkingDirectory) + +# - task: PublishPipelineArtifact@1 +# displayName: 📒 Publish Manifest +# inputs: +# artifactName: SBom-$(System.JobAttempt) +# targetPath: $(System.DefaultWorkingDirectory)/_manifest \ No newline at end of file diff --git a/.ado/pr.yml b/.ado/pr.yml index 7b79617..02d2a7b 100644 --- a/.ado/pr.yml +++ b/.ado/pr.yml @@ -1,38 +1,60 @@ name: PR.$(Date:yyyy-MM-dd).$(Rev:r) trigger: none -pr: - - main +pr: none + +resources: + repositories: + - repository: OfficePipelineTemplates + type: git + name: 1ESPipelineTemplates/OfficePipelineTemplates + ref: refs/tags/release variables: - template: variables.yml -jobs: - - job: ChangeLog - displayName: Change Log +extends: + template: v1/Office.Official.PipelineTemplate.yml@OfficePipelineTemplates + parameters: pool: - vmImage: 'windows-2019' - timeoutInMinutes: 30 - - steps: - - checkout: self - clean: false - submodules: false - - - script: yarn install --frozen-lockfile - displayName: Install packages - - - script: yarn run check --changehint "Run 'yarn run change' from root of repo to generate a change file." - displayName: Check for change files - - - template: templates/windows-build-job.yml - parameters: - DependsOn: ChangeLog - - - template: templates/apple-build-job.yml - parameters: - DependsOn: ChangeLog - - - template: templates/linux-build-job.yml - parameters: - DependsOn: ChangeLog + name: Azure-Pipelines-1ESPT-ExDShared + image: windows-latest + os: windows + + stages: + - stage: placeholder + jobs: + - job: Placeholder + steps: + - script: echo "This is a placeholder stage." + + +# jobs: +# - job: ChangeLog +# displayName: Change Log +# pool: +# vmImage: 'windows-2019' +# timeoutInMinutes: 30 + +# steps: +# - checkout: self +# clean: false +# submodules: false + +# - script: yarn install --frozen-lockfile +# displayName: Install packages + +# - script: yarn run check --changehint "Run 'yarn run change' from root of repo to generate a change file." +# displayName: Check for change files + +# - template: templates/windows-build-job.yml +# parameters: +# DependsOn: ChangeLog + +# - template: templates/apple-build-job.yml +# parameters: +# DependsOn: ChangeLog + +# - template: templates/linux-build-job.yml +# parameters: +# DependsOn: ChangeLog From fd16618f66a0ab03043f2137d4fa91dbd1f4fecc Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Mon, 3 Nov 2025 16:31:24 -0800 Subject: [PATCH 2/3] Fix AI generated errors. --- .ado/build.yml | 4 ++-- .ado/pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ado/build.yml b/.ado/build.yml index 5ea1199..745b7a4 100644 --- a/.ado/build.yml +++ b/.ado/build.yml @@ -24,9 +24,9 @@ extends: stages: - stage: placeholder jobs: - - job: Placeholder + - job: placeholder steps: - - script: echo "This is a placeholder stage." + - script: echo "This is a placeholder job." # stages: diff --git a/.ado/pr.yml b/.ado/pr.yml index 02d2a7b..39f2e06 100644 --- a/.ado/pr.yml +++ b/.ado/pr.yml @@ -24,9 +24,9 @@ extends: stages: - stage: placeholder jobs: - - job: Placeholder + - job: placeholder steps: - - script: echo "This is a placeholder stage." + - script: echo "This is a placeholder job." # jobs: From a4ab7bbc23d9bd74047be0b790c5c8e4fa29c4b6 Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Mon, 3 Nov 2025 16:35:19 -0800 Subject: [PATCH 3/3] Revert trigger changes. --- .ado/build.yml | 7 ++++++- .ado/pr.yml | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.ado/build.yml b/.ado/build.yml index 745b7a4..4301ce3 100644 --- a/.ado/build.yml +++ b/.ado/build.yml @@ -1,6 +1,11 @@ name: Build.$(Date:yyyy-MM-dd).$(Rev:r) -trigger: none +trigger: + batch: true + branches: + include: + - main + pr: none resources: diff --git a/.ado/pr.yml b/.ado/pr.yml index 39f2e06..ab145c5 100644 --- a/.ado/pr.yml +++ b/.ado/pr.yml @@ -1,7 +1,8 @@ name: PR.$(Date:yyyy-MM-dd).$(Rev:r) trigger: none -pr: none +pr: + - main resources: repositories: