Skip to content

Commit 330933f

Browse files
Convert to 1ES template (#730)
1 parent 2cce982 commit 330933f

5 files changed

+73
-68
lines changed

azure-pipelines.yml

+7
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,10 @@ jobs:
1616
vmImage: windows-latest
1717
steps:
1818
- template: azure-pipelines/build.yml
19+
- task: PublishBuildArtifacts@1
20+
inputs:
21+
PathtoPublish: $(Build.ArtifactStagingDirectory)/build_logs
22+
ArtifactName: build_logs
23+
ArtifactType: Container
24+
displayName: Publish build_logs artifacts
25+
condition: succeededOrFailed()

azure-pipelines/azure-pipeline.microbuild.after.yml

+1-30
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ steps:
33
displayName: 'Generate SBOM For VSIX Insertion'
44
inputs:
55
BuildDropPath: '$(Build.SourcesDirectory)\bin\Microsoft.Web.LibraryManager.Vsix\Release'
6+
67
- task: MSBuild@1
78
displayName: Build VS Installer Manifest
89
inputs:
@@ -29,29 +30,6 @@ steps:
2930
flattenFolders: true
3031
displayName: Collecting VS Insertion artifacts
3132

32-
- task: PublishBuildArtifacts@1
33-
inputs:
34-
PathtoPublish: $(Build.ArtifactStagingDirectory)/insertion
35-
ArtifactName: VSInsertion
36-
ArtifactType: Container
37-
displayName: Publish insertion artifacts
38-
39-
- task: MicroBuildUploadVstsDropFolder@1
40-
displayName: Upload artifacts to VSTS Drop
41-
inputs:
42-
AccessToken: $(System.AccessToken)
43-
DropFolder: '$(Build.ArtifactStagingDirectory)/insertion'
44-
condition: and(succeeded(), eq(variables['SignType'], 'Real'))
45-
46-
- task: MicroBuildCleanup@1
47-
condition: succeededOrFailed()
48-
displayName: MicroBuild Cleanup
49-
50-
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
51-
displayName: Component Detection
52-
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
53-
54-
# The Convert-PDB.ps1 script uses nuget.exe at the cmdline, so make sure it's on our PATH
5533
- task: NuGetToolInstaller@0
5634
inputs:
5735
versionSpec: 5.4.0
@@ -88,13 +66,6 @@ steps:
8866
TargetFolder: $(Build.ArtifactStagingDirectory)/symbols
8967
displayName: Collecting symbols artifacts
9068

91-
- task: PublishBuildArtifacts@1
92-
inputs:
93-
PathtoPublish: $(Build.ArtifactStagingDirectory)/symbols
94-
ArtifactName: symbols
95-
ArtifactType: Container
96-
displayName: Publish symbols as Azure DevOps artifacts
97-
9869
- task: PublishSymbols@2
9970
inputs:
10071
SymbolsFolder: $(Build.ArtifactStagingDirectory)/symbols
Original file line numberDiff line numberDiff line change
@@ -1,10 +1 @@
1-
steps:
2-
3-
- task: MicroBuildSigningPlugin@3
4-
inputs:
5-
signType: $(SignType)
6-
zipSources: false
7-
displayName: Install MicroBuild Signing Plugin
8-
9-
- task: MicroBuildSwixPlugin@4
10-
displayName: Install MicroBuild Swix Plugin
1+
steps: []

azure-pipelines/build.yml

+2-23
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
displayName: Install .NET Core SDK
77

88
- ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
9-
- template: azure-pipeline.microbuild.before.yml
9+
- template: /azure-pipelines/azure-pipeline.microbuild.before.yml@self
1010

1111
- script: dotnet --info
1212
displayName: Show dotnet SDK info
@@ -38,7 +38,7 @@ steps:
3838
condition: and(succeeded(), ne(variables['SignType'], 'real'))
3939

4040
- ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
41-
- template: azure-pipeline.microbuild.after.yml
41+
- template: /azure-pipelines/azure-pipeline.microbuild.after.yml@self
4242

4343
- ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
4444
- powershell: |
@@ -60,12 +60,6 @@ steps:
6060
packageSourceAuth: patAuth
6161
patVariable: '$(OneLocBuildPat)'
6262
condition: ne(variables['Build.Reason'], 'PullRequest')
63-
- task: PublishBuildArtifacts@1
64-
inputs:
65-
PathtoPublish: '$(Build.ArtifactStagingDirectory)\locAssets'
66-
ArtifactName: locAssets
67-
ArtifactType: Container
68-
displayName: Publish artifacts
6963

7064
- task: CopyFiles@1
7165
inputs:
@@ -75,18 +69,3 @@ steps:
7569
targetFolder: $(Build.ArtifactStagingDirectory)/artifacts
7670
flattenFolders: true
7771
displayName: Collecting build artifacts
78-
79-
- task: PublishBuildArtifacts@1
80-
inputs:
81-
PathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts
82-
ArtifactName: artifacts
83-
ArtifactType: Container
84-
displayName: Publish artifacts
85-
86-
- task: PublishBuildArtifacts@1
87-
inputs:
88-
PathtoPublish: $(Build.ArtifactStagingDirectory)/build_logs
89-
ArtifactName: build_logs
90-
ArtifactType: Container
91-
displayName: Publish build_logs artifacts
92-
condition: succeededOrFailed()

azure-pipelines/official.yml

+62-5
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,65 @@ variables:
1111
Packaging.EnableSBOMSigning: true
1212
Codeql.Enabled: true
1313

14-
jobs:
15-
- job: Windows
16-
pool: VSEngSS-MicroBuild2022-1ES
17-
steps:
18-
- template: build.yml
14+
resources:
15+
repositories:
16+
- repository: MicroBuildTemplate
17+
type: git
18+
name: 1ESPipelineTemplates/MicroBuildTemplate
19+
ref: refs/tags/release
20+
21+
extends:
22+
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
23+
parameters:
24+
sdl:
25+
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
26+
pool:
27+
name: AzurePipelines-EO
28+
image: AzurePipelinesWindows2022compliantGPT
29+
os: windows
30+
customBuildTags:
31+
- ES365AIMigrationTooling
32+
stages:
33+
- stage: stage
34+
jobs:
35+
- job: Windows
36+
pool: VSEngSS-MicroBuild2022-1ES
37+
templateContext:
38+
mb:
39+
signing:
40+
enabled: true
41+
signType: $(SignType)
42+
zipSources: false
43+
swix:
44+
enabled: true
45+
outputParentDirectory: $(Build.ArtifactStagingDirectory)
46+
outputs:
47+
- ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
48+
- output: pipelineArtifact
49+
displayName: 'Publish artifacts'
50+
targetPath: '$(Build.ArtifactStagingDirectory)/locAssets'
51+
artifactName: locAssets
52+
artifactType: Container
53+
- output: pipelineArtifact
54+
displayName: 'Publish artifacts'
55+
targetPath: $(Build.ArtifactStagingDirectory)/artifacts
56+
artifactName: artifacts
57+
artifactType: Container
58+
- output: pipelineArtifact
59+
displayName: 'Publish build_logs artifacts'
60+
condition: succeededOrFailed()
61+
targetPath: $(Build.ArtifactStagingDirectory)/build_logs
62+
artifactName: build_logs
63+
artifactType: Container
64+
- output: pipelineArtifact
65+
displayName: 'Publish insertion artifacts'
66+
targetPath: $(Build.ArtifactStagingDirectory)/insertion
67+
artifactName: VSInsertion
68+
artifactType: Container
69+
- output: pipelineArtifact
70+
displayName: 'Publish symbols as Azure DevOps artifacts'
71+
targetPath: $(Build.ArtifactStagingDirectory)/symbols
72+
artifactName: symbols
73+
artifactType: Container
74+
steps:
75+
- template: /azure-pipelines/build.yml@self

0 commit comments

Comments
 (0)