diff --git a/pipeline-templates/package-vsix.yaml b/pipeline-templates/package-vsix.yaml index 0ba4f0ed..61d608c5 100644 --- a/pipeline-templates/package-vsix.yaml +++ b/pipeline-templates/package-vsix.yaml @@ -77,10 +77,9 @@ jobs: Contents: '**\*.binlog' TargetFolder: '$(Build.ArtifactStagingDirectory)' flattenFolders: false - - ${{ if eq(parameters.useOneEngineeringPool, 'true') }}: - - template: publish.yaml - parameters: - pool: ${{ parameters.pool }} - SignType: ${{ parameters.SignType }} - version: $(GetVersion.version) - useOneEngineeringPool: true \ No newline at end of file + - template: publish.yaml + parameters: + pool: ${{ parameters.pool }} + SignType: ${{ parameters.SignType }} + version: $(GetVersion.version) + useOneEngineeringPool: true \ No newline at end of file diff --git a/pipeline-templates/publish.yaml b/pipeline-templates/publish.yaml index 180317f8..807fb6f2 100644 --- a/pipeline-templates/publish.yaml +++ b/pipeline-templates/publish.yaml @@ -2,10 +2,12 @@ parameters: pool: '' SignType: '' version: '' + useOneEngineeringPool: '' jobs: - job: waitForValidation displayName: ☁️ Wait for release approval + condition: eq('${{ parameters.useOneEngineeringPool }}', 'true') pool: server timeoutInMinutes: 4320 # job times out in 3 days steps: @@ -15,6 +17,7 @@ jobs: instructions: 'Please validate that the release build has been tested, and resume to publish a new version' onTimeout: 'reject' - job: Publish + condition: eq('${{ parameters.useOneEngineeringPool }}', 'true') pool: ${{ if eq(parameters.useOneEngineeringPool, 'true') }}: ${{ parameters.pool }}