Skip to content

Commit 951a6f5

Browse files
committed
Recombine release and pre-release pipelines
1 parent 859bd6a commit 951a6f5

2 files changed

Lines changed: 18 additions & 8 deletions

File tree

.azure/azure-pipelines-release.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ parameters:
88
- name: nodeVersion
99
type: string
1010
default: '20.x'
11+
- name: isPreRelease
12+
type: boolean
13+
default: false
1114

1215
resources:
1316
repositories:
@@ -30,8 +33,18 @@ extends:
3033
name: AzurePipelines-EO
3134
image: 1ESPT-Windows2022
3235
stages:
33-
- template: stages/pipeline-stages.yml
36+
# Stage to build the VSIX and publish it
37+
- template: stages/build.yml
3438
parameters:
35-
isPreRelease: false
39+
isPreRelease: ${{ parameters.isPreRelease }}
3640
nodeVersion: ${{ parameters.nodeVersion }}
3741
signType: 'real'
42+
43+
# Stage provides a manual approval step before the publish stage is run
44+
- template: stages/approval.yml
45+
46+
# Publish the VSIX to the extension marketplace
47+
- template: stages/publish.yml
48+
parameters:
49+
isPreRelease: ${{ parameters.isPreRelease }}
50+
nodeVersion: ${{ parameters.nodeVersion }}

.azure/steps/sign.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@ steps:
2020
- task: MicroBuildSigningPlugin@4
2121
displayName: "Install Signing Plugin"
2222
inputs:
23-
${{ if eq(parameters.signType, 'real') }}:
24-
signType: real
25-
signWithProd: true
26-
ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39
27-
${{ else }}:
28-
signType: test
23+
signType: real
24+
signWithProd: true
25+
ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39
2926
ConnectedServiceName: "MicroBuild Signing Task (DevDiv)"
3027
feedSource: "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"
3128
env:

0 commit comments

Comments
 (0)