Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/yaml/jobs/binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ parameters:
Configuration: Both
IsMicroBuildInternal: false
OneESPT: false
ConnectedPMEServiceName: ''

jobs:
# Windows Binaries
- template: windows/binaries.yaml@self
parameters:
IndexSources: ${{ parameters.IndexSources }}
SignType: ${{ parameters.SignType }}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}
IsMicroBuildInternal: ${{ parameters.IsMicroBuildInternal }}
OneESPT: ${{ parameters.OneESPT }}
# Filter out Tests for Signed Builds
Expand Down
2 changes: 2 additions & 0 deletions build/yaml/jobs/linux/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
IsMicroBuildInternal: false
MatrixStrategy: {}
OneESPT: false
ConnectedPMEServiceName: ''

jobs:
- job: Linux_Packages
Expand Down Expand Up @@ -37,6 +38,7 @@ jobs:
- template: ../../steps/microbuild/signing.yaml@self
parameters:
SignType: ${{ parameters.SignType }}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}

- template: ../../steps/linux/packages.yaml@self
parameters:
Expand Down
3 changes: 3 additions & 0 deletions build/yaml/jobs/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ parameters:
Configuration: Both
IsMicroBuildInternal: false
OneESPT: false
ConnectedPMEServiceName: ''

jobs:
# Windows Packages
- template: windows/packages.yaml@self
parameters:
SignType: ${{ parameters.SignType }}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}
IsMicroBuildInternal: ${{ parameters.IsMicroBuildInternal }}
OneESPT: ${{ parameters.OneESPT }}
MatrixStrategy:
Expand Down Expand Up @@ -47,6 +49,7 @@ jobs:
- template: linux/packages.yaml@self
parameters:
SignType: ${{ parameters.SignType }}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}
IsMicroBuildInternal: ${{ parameters.IsMicroBuildInternal }}
OneESPT: ${{ parameters.OneESPT }}
MatrixStrategy:
Expand Down
3 changes: 2 additions & 1 deletion build/yaml/jobs/windows/binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ parameters:
CopyFilters: |
**
OneESPT: false
ConnectedPMEServiceName: ''

jobs:
- job: Windows
Expand Down Expand Up @@ -45,6 +46,7 @@ jobs:
- template: ../../steps/microbuild/signing.yaml@self
parameters:
SignType: ${{ parameters.SignType }}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}

- template: ../../steps/windows/binaries.yaml@self
parameters:
Expand Down Expand Up @@ -88,4 +90,3 @@ jobs:
- template: ../../steps/microbuild/cleanup.yaml@self

- template: ../../steps/azuredevops/componentgovernance.yaml@self

2 changes: 2 additions & 0 deletions build/yaml/jobs/windows/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
IsMicroBuildInternal: false
MatrixStrategy: {}
OneESPT: false
ConnectedPMEServiceName: ''

jobs:
- job: Windows_Packages
Expand Down Expand Up @@ -37,6 +38,7 @@ jobs:
- template: ../../steps/microbuild/signing.yaml@self
parameters:
SignType: ${{ parameters.SignType }}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}

- template: ../../steps/azuredevops/downloadbuildartifacts.yaml@self
parameters:
Expand Down
1 change: 1 addition & 0 deletions build/yaml/pipelines/signed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ extends:
IncludeTests: false
Configuration: Release
SignType: $(SignType) # NOTE this string won't be replaced until runtime
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea

- stage: PostPackage
jobs:
Expand Down
4 changes: 4 additions & 0 deletions build/yaml/stages/build_and_package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
IncludeTests: true
Configuration: Both
SignType: None
ConnectedPMEServiceName: ''

stages:
- stage: Build
Expand All @@ -12,11 +13,13 @@ stages:
- template: ../jobs/binaries.yaml@self
parameters:
SignType: ${{ parameters.SignType}}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}
IndexSources: true
Configuration: ${{ parameters.Configuration }}
OneESPT: ${{ parameters.OneESPT }}
IsMicroBuildInternal: ${{ parameters.IsMicroBuildInternal }}


- ${{ if eq('true', parameters.IncludeTests) }}:
- stage: Test
dependsOn: Build
Expand All @@ -34,6 +37,7 @@ stages:
- template: ../jobs/packages.yaml@self
parameters:
SignType: ${{ parameters.SignType}}
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}
Configuration: ${{ parameters.Configuration }}
OneESPT: ${{ parameters.OneESPT }}
IsMicroBuildInternal: ${{ parameters.IsMicroBuildInternal }}
5 changes: 4 additions & 1 deletion build/yaml/steps/microbuild/signing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

parameters:
SignType: None
ConnectedPMEServiceName: ''

steps:

Expand All @@ -19,4 +20,6 @@ steps:
condition: and(succeeded(), in(variables['SignType'], 'Real', 'Test'))
inputs:
signType: ${{ parameters.SignType }}
zipSources: false
zipSources: false
${{ if ne(parameters.ConnectedPMEServiceName, '') }}:
ConnectedPMEServiceName: ${{ parameters.ConnectedPMEServiceName }}
Loading