Skip to content

Commit 9212eeb

Browse files
authored
Use 1ES releaseJob in release.yml (#7924)
2 parents 2bdac7f + e1d2deb commit 9212eeb

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

azure-pipelines/build.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,32 @@ jobs:
6767
env:
6868
SignType: $(signType)
6969

70+
- task: CopyFiles@2
71+
inputs:
72+
SourceFolder: '$(Build.SourcesDirectory)/vsix'
73+
TargetFolder: '$(Build.SourcesDirectory)/Packages/VSIX_$(channel)'
74+
7075
- ${{ if eq(parameters.isOfficial, true) }}:
7176
- task: 1ES.PublishBuildArtifacts@1
7277
condition: succeeded()
7378
displayName: 'Publish VSIXs'
7479
inputs:
75-
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
76-
ArtifactName: 'VSIX_$(channel)'
80+
PathtoPublish: '$(Build.SourcesDirectory)/Packages'
81+
ArtifactName: 'Packages'
7782
- task: 1ES.PublishBuildArtifacts@1
7883
condition: succeededOrFailed()
7984
displayName: 'Publish Signing Logs'
8085
inputs:
8186
PathtoPublish: '$(Build.SourcesDirectory)/out/logs'
8287
ArtifactName: '${{ parameters.platform }} Signing Logs'
88+
8389
- ${{ else }}:
8490
- task: PublishBuildArtifacts@1
8591
condition: succeeded()
8692
displayName: 'Publish VSIXs'
8793
inputs:
88-
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
89-
ArtifactName: 'VSIX_$(channel)'
94+
PathtoPublish: '$(Build.SourcesDirectory)/Packages'
95+
ArtifactName: 'Packages'
9096

9197
- script: npm run test:artifacts
92-
displayName: 'Run artifacts tests'
98+
displayName: 'Run artifacts tests'

azure-pipelines/release.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,18 @@ extends:
3939
name: netcore1espool-internal
4040
image: 1es-ubuntu-2204
4141
os: linux
42+
templateContext:
43+
type: releaseJob
44+
isProduction: true
45+
inputs:
46+
- input: pipelineArtifact
47+
pipeline: officialBuildCI
48+
artifactName: Packages
49+
destinationPath: $(Pipeline.Workspace)
4250
strategy:
4351
runOnce:
4452
deploy:
4553
steps:
46-
- download: 'none'
47-
- task: DownloadPipelineArtifact@2
48-
displayName: '📦 Download artifacts from build pipeline.'
49-
inputs:
50-
buildType: 'specific'
51-
project: 'internal'
52-
definition: 1264
53-
buildVersionToDownload: 'specific'
54-
buildId: '$(resources.pipeline.officialBuildCI.runID)'
55-
branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)'
5654
- template: /azure-pipelines/install-node.yml@self
5755
- pwsh: |
5856
npm install --global @vscode/vsce

0 commit comments

Comments
 (0)